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

Bug #25447551: HANDLE_FATAL_SIGNAL (SIG=11) IN

Browse Source 
FT_BOOLEAN_CHECK_SYNTAX_STRING

ISSUE: my_isalnum macro used for checking if character is
       alphanumeric dereferences uninitialized pointer
       in default character set structure resulting in
       server exiting abnormally.

FIX: Used standard isalnum function instead of macro my_isalnum.
This commit is contained in:
Kailasnath Nagarkar 2017-03-15 16:45:21 +05:30
parent 8ea859d300
commit d8328690d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
storage/myisam/ft_parser.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -16,6 +16,7 @@
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */ /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
#include "ftdefs.h" #include "ftdefs.h"
#include "ctype.h"
typedef struct st_ft_docstat { typedef struct st_ft_docstat {
FT_WORD *list; FT_WORD *list;
@ -89,7 +90,7 @@ my_bool ft_boolean_check_syntax_string(const uchar *str)
for (i=0; i<sizeof(DEFAULT_FTB_SYNTAX); i++) for (i=0; i<sizeof(DEFAULT_FTB_SYNTAX); i++)
{ {
/* limiting to 7-bit ascii only */ /* limiting to 7-bit ascii only */
if ((unsigned char)(str[i]) > 127 || my_isalnum(default_charset_info, str[i])) if ((unsigned char)(str[i]) > 127 || isalnum(str[i]))
return 1; return 1;
for (j=0; j<i; j++) for (j=0; j<i; j++)
if (str[i] == str[j] && (i != 11 || j != 10)) if (str[i] == str[j] && (i != 11 || j != 10))