firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 21:23:04 +01:00
Code Issues

Fixed decompression regression found using TCS, thanks to Adriano

Browse Source
This commit is contained in:
Dmitry Yemanov 2022-09-29 11:58:52 +03:00
parent 87537f5836
commit 0077763803
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jrd/vio.cpp
View File

@ -572,13 +572,27 @@ namespace
{
if (rpb->rpb_flags & rpb_not_packed)
{
if (outLength < rpb->rpb_length)
BUGCHECK(179); // msg 179 decompression overran buffer
rpb->rpb_flags &= ~rpb_not_packed;
memcpy(output, rpb->rpb_address, rpb->rpb_length);
output += rpb->rpb_length;
const auto length = MIN(rpb->rpb_length, outLength);
memcpy(output, rpb->rpb_address, length);
output += length;
if (rpb->rpb_length > length)
{
// Short records may be zero-padded up to the fragmented header size.
// Take it into account while checking for a possible buffer overrun.
auto tail = rpb->rpb_address + length;
const auto end = rpb->rpb_address + rpb->rpb_length;
while (tail < end)
{
if (*tail++)
BUGCHECK(179); // msg 179 decompression overran buffer
}
}
return output;
}