Skip to content

Commit b3250ab

Browse files
committed
MENT-787 Server from bb-10.5-MENT-30 crashes upon Spider installation
It looks buffer over flow of spider_unique_id_buf. It requires to analyze on reproducing environment, but I extend this first.
1 parent 0b7fe26 commit b3250ab

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

storage/spider/spd_table.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ extern ulonglong spider_free_mem_count[SPIDER_MEM_CALC_LIST_NUM];
406406
static char spider_wild_many = '%', spider_wild_one = '_',
407407
spider_wild_prefix='\\';
408408

409-
static char spider_unique_id_buf[1 + 12 + 1 + 16 + 1 + 1];
409+
static char spider_unique_id_buf[1 + 12 + 1 + (16 * 2) + 1 + 1];
410410
LEX_CSTRING spider_unique_id;
411411

412412
// for spider_open_tables
@@ -7244,7 +7244,7 @@ int spider_db_init(
72447244
) {
72457245
int error_num = HA_ERR_OUT_OF_MEM, roop_count;
72467246
uint dbton_id = 0;
7247-
char addr[6];
7247+
uchar addr[6];
72487248
handlerton *spider_hton = (handlerton *)p;
72497249
DBUG_ENTER("spider_db_init");
72507250
spider_hton_ptr = spider_hton;

0 commit comments

Comments
 (0)