diff options
| author | dkatz@damien-katzs-computer.local <> | 2007-05-16 16:14:13 -0400 |
|---|---|---|
| committer | dkatz@damien-katzs-computer.local <> | 2007-05-16 16:14:13 -0400 |
| commit | 41dac2227130a643766f27bbf912cc6524151242 (patch) | |
| tree | 737b47a5d91767cfbf2a66cd8ed935b36a371408 /myisam | |
| parent | 4fed3bd42539675d37338b792598b9b079edff68 (diff) | |
| download | mariadb-git-41dac2227130a643766f27bbf912cc6524151242.tar.gz | |
Bug #27119 server crash with integer division by zero during filesort on huge result
Added checks to detect integer overflow and fixed other bugs on the error path.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sort.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 3cb48b47b2c..f918283503e 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -773,7 +773,7 @@ static int NEAR_F merge_many_buff(MI_SORT_PARAM *info, uint keys, { if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++, buffpek+i,buffpek+i+MERGEBUFF-1)) - break; /* purecov: inspected */ + goto cleanup; } if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++, buffpek+i,buffpek+ *maxbuffer)) @@ -783,6 +783,7 @@ static int NEAR_F merge_many_buff(MI_SORT_PARAM *info, uint keys, temp=from_file; from_file=to_file; to_file=temp; *maxbuffer= (int) (lastbuff-buffpek)-1; } +cleanup: close_cached_file(to_file); /* This holds old result */ if (to_file == t_file) *t_file=t_file2; /* Copy result file */ |