mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

FRM: fail to load extra2 option with size 1 fix

Browse source 
From comment in unreg.h:

  Types of values in the MariaDB extra2 frm segment.
  Each value is written as
    type:       1 byte
    length:     1 byte  (1..255) or \0 and 2 bytes.
    binary value of the 'length' bytes.

length == 1 is valid.
This commit is contained in:
Aleksey Midenkov 2016-09-20 15:41:38 +00:00 • committed by Sergey Vojtovich
parent 0c6ff122fa
commit 51b30586ea
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/table.cc
View file

@ -1221,7 +1221,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
if (*extra2 != '/') // old frm had '/' there if (*extra2 != '/') // old frm had '/' there
{ {
const uchar *e2end= extra2 + len; const uchar *e2end= extra2 + len;
while (extra2 + 3 < e2end) while (extra2 + 3 <= e2end)
{ {
uchar type= *extra2++; uchar type= *extra2++;
size_t length= *extra2++; size_t length= *extra2++;