1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

filesort.cc:

Browse Source 
Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.


sql/filesort.cc:
  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.
This commit is contained in:
unknown 2008-01-10 18:54:34 +03:00
parent 3dba2ea82a
commit 1a8bcceb2d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/filesort.cc
View File

@ -239,10 +239,14 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
} }
else else
{ {
if (table_sort.buffpek && table_sort.buffpek_len < maxbuffer)
{
x_free(table_sort.buffpek);
table_sort.buffpek= 0;
}
if (!(table_sort.buffpek= if (!(table_sort.buffpek=
read_buffpek_from_file(&buffpek_pointers, maxbuffer, read_buffpek_from_file(&buffpek_pointers, maxbuffer,
(table_sort.buffpek_len < maxbuffer ? table_sort.buffpek)))
NULL : table_sort.buffpek))))
goto err; goto err;
buffpek= (BUFFPEK *) table_sort.buffpek; buffpek= (BUFFPEK *) table_sort.buffpek;
table_sort.buffpek_len= maxbuffer; table_sort.buffpek_len= maxbuffer;