mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 23:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-4.1-engines

Browse source 
into  mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-5.0-engines


myisam/mi_dynrec.c:
  Auto merged
This commit is contained in:
unknown 2006-10-25 15:59:05 +05:00
commit 79d9d38dea
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
myisam/mi_dynrec.c
View file

@ -1029,8 +1029,10 @@ ulong _mi_rec_unpack(register MI_INFO *info, register byte *to, byte *from,
{
uint size_length=rec_length- mi_portable_sizeof_char_ptr;
ulong blob_length=_mi_calc_blob_length(size_length,from);
if ((ulong) (from_end-from) - size_length < blob_length ||
min_pack_length > (uint) (from_end -(from+size_length+blob_length)))
ulong from_left= (ulong) (from_end - from);
if (from_left < size_length ||
from_left - size_length < blob_length ||
from_left - size_length - blob_length < min_pack_length)
goto err;
memcpy((byte*) to,(byte*) from,(size_t) size_length);
from+=size_length;