talksik/uWebSockets
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore the bytes overwritten by the tail after inflation (#1653)

Browse Source
This commit is contained in:
Sean Oxley
2023-09-04 10:04:26 +02:00
committed by GitHub
parent 3bb917da2e
commit f1b10ed221
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PerMessageDeflate.h
+9 -1
View File
@@ -245,9 +245,14 @@ struct InflationStream {
} }
#endif #endif
/* Save off the bytes we're about to overwrite */
char* tailLocation = (char*)compressed.data() + compressed.length();
char preTailBytes[4];
memcpy(preTailBytes, tailLocation, 4);
/* Append tail to chunk */ /* Append tail to chunk */
unsigned char tail[4] = {0x00, 0x00, 0xff, 0xff}; unsigned char tail[4] = {0x00, 0x00, 0xff, 0xff};
memcpy((char *)compressed.data() + compressed.length(), tail, 4); memcpy(tailLocation, tail, 4);
compressed = {compressed.data(), compressed.length() + 4}; compressed = {compressed.data(), compressed.length() + 4};
/* We clear this one here, could be done better */ /* We clear this one here, could be done better */
@@ -275,6 +280,9 @@ struct InflationStream {
inflateReset(&inflationStream); inflateReset(&inflationStream);
} }
/* Restore the bytes we used for the tail */
memcpy(tailLocation, preTailBytes, 4);
if ((err != Z_BUF_ERROR && err != Z_OK) || zlibContext->dynamicInflationBuffer.length() > maxPayloadLength) { if ((err != Z_BUF_ERROR && err != Z_OK) || zlibContext->dynamicInflationBuffer.length() > maxPayloadLength) {
return std::nullopt; return std::nullopt;
} }