database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug#11764310 - 57132: CONV FUNCTION CRASHES, NEGATIVE ARGUMENT TO MEMCPY

Browse Source 
Amendment to previous patch:
Failure in CONV() should return NULL instead of
empty set.
When compiled on Windows or Solaris the function
Item_func_conv::val_str() doesn't fail on 
longlong2str() but finds an earlier exit path
based on the attributes of the arguments.
This exit path returns NULL on failure and as a
consequence the original patch caused different
test results depending on the OS used.
This commit is contained in:
Kristofer Pettersson
2011-09-15 10:01:15 +02:00
parent 39175b9225
commit e9d23b5a89
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_str.result
View File

@ -2789,7 +2789,7 @@ DROP TABLE t1;
# #
SELECT CONV(1,-2147483648,-2147483648); SELECT CONV(1,-2147483648,-2147483648);
CONV(1,-2147483648,-2147483648) CONV(1,-2147483648,-2147483648)
NULL
# #
# End of 5.5 tests # End of 5.5 tests
# #

5
sql/item_strfunc.cc
View File

@ -2954,7 +2954,10 @@ String *Item_func_conv::val_str(String *str)
if (!(ptr= longlong2str(dec, ans, to_base)) || if (!(ptr= longlong2str(dec, ans, to_base)) ||
str->copy(ans, (uint32) (ptr - ans), default_charset())) str->copy(ans, (uint32) (ptr - ans), default_charset()))
return make_empty_result(); {
null_value= 1;
return NULL;
}
return str; return str;
} }