database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug #59884: setting charset to 2048 crashes

Browse Source 
The retrieval of a charset by number was not
doing bounds checking before accessing the internal 
character sets array.
Added checks for valid charset number.
Added asserts for valid charset number to some of 
the internal functions.
Removed one superfluous check for charset_number 0
(since the all_charsets_array[0] is set to 0 anyway) for 
uniformity.
Test suite added.
This commit is contained in:
Georgi Kodinov
2011-02-10 09:34:22 +02:00
parent 7d88b552e2
commit b2b69699ef
3 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/r/variables.result
View File

@ -1732,3 +1732,25 @@ set @@session.autocommit=t1_min(), @@session.autocommit=t1_max(),
drop table t1; drop table t1;
drop function t1_min; drop function t1_min;
drop function t1_max; drop function t1_max;
#
# Bug #59884: setting charset to 2048 crashes
#
set session character_set_results = 2048;
ERROR 42000: Unknown character set: '2048'
set session character_set_client=2048;
ERROR 42000: Unknown character set: '2048'
set session character_set_connection=2048;
ERROR 42000: Unknown character set: '2048'
set session character_set_server=2048;
ERROR 42000: Unknown character set: '2048'
set session collation_server=2048;
ERROR HY000: Unknown collation: '2048'
set session character_set_filesystem=2048;
ERROR 42000: Unknown character set: '2048'
set session character_set_database=2048;
ERROR 42000: Unknown character set: '2048'
set session collation_connection=2048;
ERROR HY000: Unknown collation: '2048'
set session collation_database=2048;
ERROR HY000: Unknown collation: '2048'
End of 5.5 tests

26
mysql-test/t/variables.test
View File

@ -1476,3 +1476,29 @@ drop function t1_max;
########################################################################### ###########################################################################
--echo #
--echo # Bug #59884: setting charset to 2048 crashes
--echo #
--error ER_UNKNOWN_CHARACTER_SET
set session character_set_results = 2048;
--error ER_UNKNOWN_CHARACTER_SET
set session character_set_client=2048;
--error ER_UNKNOWN_CHARACTER_SET
set session character_set_connection=2048;
--error ER_UNKNOWN_CHARACTER_SET
set session character_set_server=2048;
--error ER_UNKNOWN_COLLATION
set session collation_server=2048;
--error ER_UNKNOWN_CHARACTER_SET
set session character_set_filesystem=2048;
--error ER_UNKNOWN_CHARACTER_SET
set session character_set_database=2048;
--error ER_UNKNOWN_COLLATION
set session collation_connection=2048;
--error ER_UNKNOWN_COLLATION
set session collation_database=2048;
--echo End of 5.5 tests

20
mysys/charset.c
View File

@ -419,6 +419,7 @@ CHARSET_INFO *default_charset_info = &my_charset_latin1;
void add_compiled_collation(CHARSET_INFO *cs) void add_compiled_collation(CHARSET_INFO *cs)
{ {
DBUG_ASSERT(cs->number < array_elements(all_charsets));
all_charsets[cs->number]= cs; all_charsets[cs->number]= cs;
cs->state|= MY_CS_AVAILABLE; cs->state|= MY_CS_AVAILABLE;
} }
@ -529,14 +530,17 @@ uint get_charset_number(const char *charset_name, uint cs_flags)
const char *get_charset_name(uint charset_number) const char *get_charset_name(uint charset_number)
{ {
CHARSET_INFO *cs;
my_pthread_once(&charsets_initialized, init_available_charsets); my_pthread_once(&charsets_initialized, init_available_charsets);
cs=all_charsets[charset_number]; if (charset_number < array_elements(all_charsets))
if (cs && (cs->number == charset_number) && cs->name ) {
return (char*) cs->name; CHARSET_INFO *cs= all_charsets[charset_number];
if (cs && (cs->number == charset_number) && cs->name)
return (char*) cs->name;
}
return (char*) "?"; /* this mimics find_type() */ return "?"; /* this mimics find_type() */
} }
@ -545,6 +549,8 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
char buf[FN_REFLEN]; char buf[FN_REFLEN];
CHARSET_INFO *cs; CHARSET_INFO *cs;
DBUG_ASSERT(cs_number < array_elements(all_charsets));
if ((cs= all_charsets[cs_number])) if ((cs= all_charsets[cs_number]))
{ {
if (cs->state & MY_CS_READY) /* if CS is already initialized */ if (cs->state & MY_CS_READY) /* if CS is already initialized */
@ -589,8 +595,8 @@ CHARSET_INFO *get_charset(uint cs_number, myf flags)
return default_charset_info; return default_charset_info;
my_pthread_once(&charsets_initialized, init_available_charsets); my_pthread_once(&charsets_initialized, init_available_charsets);
if (!cs_number || cs_number > array_elements(all_charsets)) if (cs_number >= array_elements(all_charsets))
return NULL; return NULL;
cs=get_internal_charset(cs_number, flags); cs=get_internal_charset(cs_number, flags);