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

MDEV-6548: Incorrect compression on LZMA.

Browse Source 
Analysis: Provided incorrect parameter to output buffer size
and incorrectly determined actual payload size after compression.
This commit is contained in:
Jan Lindström
2014-08-07 13:44:00 +03:00
parent 50777e26f0
commit d87ffeb491
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
storage/innobase/fil/fil0pagecompress.cc
View File

@@ -346,17 +346,20 @@ fil_compress_page(
len, len,
reinterpret_cast<uint8_t*>(out_buf + header_len), reinterpret_cast<uint8_t*>(out_buf + header_len),
&out_pos, &out_pos,
(size_t)&write_size); (size_t)write_size);
if (err != LZMA_OK || write_size > UNIV_PAGE_SIZE-header_len) { if (err != LZMA_OK || out_pos > UNIV_PAGE_SIZE-header_len) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: Compression failed for space %lu name %s len %lu err %d write_size %lu\n", "InnoDB: Warning: Compression failed for space %lu name %s len %lu err %d write_size %lu\n",
space_id, fil_space_name(space), len, err, write_size); space_id, fil_space_name(space), len, err, out_pos);
srv_stats.pages_page_compression_error.inc(); srv_stats.pages_page_compression_error.inc();
*out_len = len; *out_len = len;
return (buf); return (buf);
} }
write_size = out_pos;
break; break;
} }
#endif /* HAVE_LZMA */ #endif /* HAVE_LZMA */

9
storage/xtradb/fil/fil0pagecompress.cc
View File

@@ -345,16 +345,19 @@ fil_compress_page(
len, len,
reinterpret_cast<uint8_t*>(out_buf + header_len), reinterpret_cast<uint8_t*>(out_buf + header_len),
&out_pos, &out_pos,
(size_t)&write_size); (size_t)write_size);
if (err != LZMA_OK || write_size > UNIV_PAGE_SIZE-header_len) { if (err != LZMA_OK || out_pos > UNIV_PAGE_SIZE-header_len) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: Compression failed for space %lu name %s len %lu err %d write_size %lu\n", "InnoDB: Warning: Compression failed for space %lu name %s len %lu err %d write_size %lu\n",
space_id, fil_space_name(space), len, err, write_size); space_id, fil_space_name(space), len, err, out_pos);
srv_stats.pages_page_compression_error.inc(); srv_stats.pages_page_compression_error.inc();
*out_len = len; *out_len = len;
return (buf); return (buf);
} }
write_size = out_pos;
break; break;
} }
#endif /* HAVE_LZMA */ #endif /* HAVE_LZMA */