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

MDEV-14929 - AddressSanitizer: memcpy-param-overlap in Field_longstr::compress

Browse Source 
Handle overlaping "from" and Field_blob_compressed::value for compressed
blobs similarily to regular blobs.
This commit is contained in:
Sergey Vojtovich
2018-03-21 13:54:15 +04:00
parent 69efa1343a
commit 443b9a418c
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/main/column_compression.result
View File

@ -1360,3 +1360,16 @@ SELECT a, LENGTH(a) FROM t1;
a LENGTH(a) a LENGTH(a)
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 255 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 255
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-14929 - AddressSanitizer: memcpy-param-overlap in
# Field_longstr::compress
#
CREATE TABLE t1(b BLOB COMPRESSED);
INSERT INTO t1 VALUES('foo'),('bar');
SET SESSION optimizer_switch = 'derived_merge=off';
SELECT * FROM ( SELECT * FROM t1 ) AS sq ORDER BY b;
b
bar
foo
SET SESSION optimizer_switch=DEFAULT;
DROP TABLE t1;

12
mysql-test/main/column_compression.test
View File

@ -79,3 +79,15 @@ INSERT INTO t1 VALUES(REPEAT('a', 255));
SET column_compression_threshold=DEFAULT; SET column_compression_threshold=DEFAULT;
SELECT a, LENGTH(a) FROM t1; SELECT a, LENGTH(a) FROM t1;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # MDEV-14929 - AddressSanitizer: memcpy-param-overlap in
--echo # Field_longstr::compress
--echo #
CREATE TABLE t1(b BLOB COMPRESSED);
INSERT INTO t1 VALUES('foo'),('bar');
SET SESSION optimizer_switch = 'derived_merge=off';
SELECT * FROM ( SELECT * FROM t1 ) AS sq ORDER BY b;
SET SESSION optimizer_switch=DEFAULT;
DROP TABLE t1;

17
sql/field.cc
View File

@ -8699,17 +8699,22 @@ int Field_blob_compressed::store(const char *from, size_t length,
{ {
ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED; ASSERT_COLUMN_MARKED_FOR_WRITE_OR_COMPUTED;
uint to_length= (uint)MY_MIN(max_data_length(), field_charset->mbmaxlen * length + 1); uint to_length= (uint)MY_MIN(max_data_length(), field_charset->mbmaxlen * length + 1);
String tmp(from, length, cs);
int rc; int rc;
if (value.alloc(to_length)) if (from >= value.ptr() && from <= value.end() && tmp.copy(from, length, cs))
{ goto oom;
set_ptr((uint32) 0, NULL);
return -1;
}
rc= compress((char*) value.ptr(), &to_length, from, (uint)length, cs); if (value.alloc(to_length))
goto oom;
rc= compress((char*) value.ptr(), &to_length, tmp.ptr(), (uint) length, cs);
set_ptr(to_length, (uchar*) value.ptr()); set_ptr(to_length, (uchar*) value.ptr());
return rc; return rc;
oom:
set_ptr((uint32) 0, NULL);
return -1;
} }