summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com/june.mysql.com>2007-01-24 11:38:23 +0400
committerunknown <svoj@mysql.com/june.mysql.com>2007-01-24 11:38:23 +0400
commit7513ef265116f390049526db8c89844428ec76ec (patch)
tree6a446e9807e1e0fe6d381d33d148f1aa06f0cdac /myisam
parent1f4d8ba0855ed0ac895425515bf6427b8b15a02d (diff)
parentfde52a2f827654f02dae9e0cd69f262bb54ee11a (diff)
downloadmariadb-git-7513ef265116f390049526db8c89844428ec76ec.tar.gz
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_open.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 047686278b4..b007eb63e63 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -435,6 +435,13 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
offset+=share->rec[i].length;
}
share->rec[i].type=(int) FIELD_LAST; /* End marker */
+ if (offset > share->base.reclength)
+ {
+ /* purecov: begin inspected */
+ my_errno= HA_ERR_CRASHED;
+ goto err;
+ /* purecov: end */
+ }
if (! lock_error)
{