summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-08-29 13:42:14 +0200
committerunknown <serg@serg.mysql.com>2001-08-29 13:42:14 +0200
commit9dffefc40e712f1419ba216f09892db3798d6443 (patch)
tree91fc40d01f64e33e78350b006d4150e61d3ac543 /myisam
parent7374310f96778ad122f6e7006eaa81d759227d5b (diff)
downloadmariadb-git-9dffefc40e712f1419ba216f09892db3798d6443.tar.gz
"freeing of unallocated pointer" bug fixed
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_check.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index fd327b96e6d..587f90e0929 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1111,6 +1111,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
SORT_INFO *sort_info= &param->sort_info;
DBUG_ENTER("mi_repair");
+ sort_info->buff=sort_info->record=0;
start_records=info->state->records;
new_header_length=(param->testflag & T_UNPACK) ? 0L :
share->pack.header_length;
@@ -1329,9 +1330,7 @@ err:
}
mi_mark_crashed_on_repair(info);
}
- if (sort_info->record)
- my_free(sort_info->record,MYF(0));
-
+ my_free(sort_info->record,MYF(MY_ALLOW_ZERO_PTR));
my_free(sort_info->buff,MYF(MY_ALLOW_ZERO_PTR));
VOID(end_io_cache(&param->read_cache));
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);