mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 01:34:17 +01:00
MDEV-4513 Valgrind warnings (Conditional jump or move depends on uninitialised value) in inflate on UNCOMPRESS
This commit is contained in:
parent
5d0122bd77
commit
cc2c296309
3 changed files with 18 additions and 1 deletions
|
@ -147,3 +147,11 @@ DROP TABLE t1;
|
|||
#
|
||||
# End of 5.3 tests
|
||||
#
|
||||
SELECT UNCOMPRESS(CAST(0 AS BINARY(5)));
|
||||
UNCOMPRESS(CAST(0 AS BINARY(5)))
|
||||
NULL
|
||||
Warnings:
|
||||
Warning 1259 ZLIB: Input data corrupted
|
||||
#
|
||||
# End of 5.5 tests
|
||||
#
|
||||
|
|
|
@ -136,3 +136,12 @@ DROP TABLE t1;
|
|||
--echo #
|
||||
--echo # End of 5.3 tests
|
||||
--echo #
|
||||
|
||||
#
|
||||
# MDEV-4513 Valgrind warnings (Conditional jump or move depends on uninitialised value) in inflate on UNCOMPRESS
|
||||
#
|
||||
SELECT UNCOMPRESS(CAST(0 AS BINARY(5)));
|
||||
|
||||
--echo #
|
||||
--echo # End of 5.5 tests
|
||||
--echo #
|
||||
|
|
|
@ -3720,7 +3720,7 @@ String *Item_func_uncompress::val_str(String *str)
|
|||
goto err;
|
||||
|
||||
if ((err= uncompress((Byte*)buffer.ptr(), &new_size,
|
||||
((const Bytef*)res->ptr())+4,res->length())) == Z_OK)
|
||||
((const Bytef*)res->ptr())+4,res->length()-4)) == Z_OK)
|
||||
{
|
||||
buffer.length((uint32) new_size);
|
||||
return &buffer;
|
||||
|
|
Loading…
Add table
Reference in a new issue