diff options
author | serg@serg.mysql.com <> | 2001-08-29 13:42:14 +0200 |
---|---|---|
committer | serg@serg.mysql.com <> | 2001-08-29 13:42:14 +0200 |
commit | aeafb909e0636977a140eae10c7ac22149848226 (patch) | |
tree | 91fc40d01f64e33e78350b006d4150e61d3ac543 | |
parent | d9652cdc5529c555b3ab8619efad93a9f3487152 (diff) | |
download | mariadb-git-aeafb909e0636977a140eae10c7ac22149848226.tar.gz |
"freeing of unallocated pointer" bug fixed
-rw-r--r-- | myisam/mi_check.c | 5 |
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= ¶m->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(¶m->read_cache)); info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED); |