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

Hook up maxPayloadLength for Zlib too

Browse Source
This commit is contained in:
Alex Hultman
2018-12-29 13:47:15 +01:00
parent 50de2cea89
commit e70eb78ae3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PerMessageDeflate.h
+5 -6
View File
@@ -26,7 +26,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#define LARGE_BUFFER_SIZE 16000 // fix this #define LARGE_BUFFER_SIZE 1024 * 16 // fix this
struct ZlibContext { struct ZlibContext {
/* Any returned data is valid until next same-class call. /* Any returned data is valid until next same-class call.
@@ -109,10 +109,9 @@ struct InflationStream {
inflateInit2(&inflationStream, -15); inflateInit2(&inflationStream, -15);
} }
std::string_view inflate(ZlibContext *zlibContext, std::string_view compressed) { std::string_view inflate(ZlibContext *zlibContext, std::string_view compressed, size_t maxPayloadLength) {
int maxPayload = 160000; // todo: fix this
/* We clear this one here, could be done better */
zlibContext->dynamicInflationBuffer.clear(); zlibContext->dynamicInflationBuffer.clear();
inflationStream.next_in = (Bytef *) compressed.data(); inflationStream.next_in = (Bytef *) compressed.data();
@@ -128,11 +127,11 @@ struct InflationStream {
} }
zlibContext->dynamicInflationBuffer.append(zlibContext->inflationBuffer, LARGE_BUFFER_SIZE - inflationStream.avail_out); zlibContext->dynamicInflationBuffer.append(zlibContext->inflationBuffer, LARGE_BUFFER_SIZE - inflationStream.avail_out);
} while (err == Z_BUF_ERROR && zlibContext->dynamicInflationBuffer.length() <= maxPayload); } while (err == Z_BUF_ERROR && zlibContext->dynamicInflationBuffer.length() <= maxPayloadLength);
inflateReset(&inflationStream); inflateReset(&inflationStream);
if ((err != Z_BUF_ERROR && err != Z_OK) || zlibContext->dynamicInflationBuffer.length() > maxPayload) { if ((err != Z_BUF_ERROR && err != Z_OK) || zlibContext->dynamicInflationBuffer.length() > maxPayloadLength) {
return {nullptr, 0}; return {nullptr, 0};
} }
src/WebSocketContext.h
+2 -2
View File
@@ -82,7 +82,7 @@ private:
) )
); );
std::string_view inflatedFrame = loopData->inflationStream->inflate(loopData->zlibContext, {data, length}); std::string_view inflatedFrame = loopData->inflationStream->inflate(loopData->zlibContext, {data, length}, webSocketContextData->maxPayloadLength);
if (!inflatedFrame.length()) { if (!inflatedFrame.length()) {
forceClose(webSocketState, s); forceClose(webSocketState, s);
return true; return true;
@@ -129,7 +129,7 @@ private:
) )
); );
std::string_view inflatedFrame = loopData->inflationStream->inflate(loopData->zlibContext, {webSocketData->fragmentBuffer.data(), webSocketData->fragmentBuffer.length() - 4}); std::string_view inflatedFrame = loopData->inflationStream->inflate(loopData->zlibContext, {webSocketData->fragmentBuffer.data(), webSocketData->fragmentBuffer.length() - 4}, webSocketContextData->maxPayloadLength);
if (!inflatedFrame.length()) { if (!inflatedFrame.length()) {
forceClose(webSocketState, s); forceClose(webSocketState, s);
return true; return true;