From a8184c3844eeeb0b9c0508ccc55e2328b79f6254 Mon Sep 17 00:00:00 2001
From: Alex Hultman <alexhultman@gmail.com>
Date: Sat, 9 Mar 2019 14:08:15 +0100
Subject: [PATCH] Fix fuzzing

---
 fuzzing/Http.cpp | 4 ++--
 src/HttpParser.h | 4 ++--
 uSockets         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fuzzing/Http.cpp b/fuzzing/Http.cpp
index f01c648..167a1df 100644
--- a/fuzzing/Http.cpp
+++ b/fuzzing/Http.cpp
@@ -12,13 +12,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
     /* Pad the fuzz */
     uWS::HttpParser httpParser;
-    memcpy(padded + 32, data, size);
+    memcpy(padded, data, size);
 
     /* User data */
     void *user = (void *) 13;
 
     /* Parse it */
-    httpParser.consumePostPadded(padded + 32, size, user, [](void *s, uWS::HttpRequest *httpRequest) -> void * {
+    httpParser.consumePostPadded(padded, size, user, [](void *s, uWS::HttpRequest *httpRequest) -> void * {
 
         /* todo: Route this via router */
 
diff --git a/src/HttpParser.h b/src/HttpParser.h
index 4237953..2d6545f 100644
--- a/src/HttpParser.h
+++ b/src/HttpParser.h
@@ -92,7 +92,7 @@ class HttpParser {
 
 private:
     std::string fallback;
-    int remainingStreamingBytes = 0;
+    unsigned int remainingStreamingBytes = 0;
 
     const size_t MAX_FALLBACK_SIZE = 1024 * 4;
 
@@ -166,7 +166,7 @@ private:
                 remainingStreamingBytes = toUnsignedInteger(contentLengthString);
 
                 if (!CONSUME_MINIMALLY) {
-                    int emittable = std::min(remainingStreamingBytes, length);
+                    unsigned int emittable = std::min<unsigned int>(remainingStreamingBytes, length);
                     dataHandler(user, std::string_view(data, emittable), emittable == remainingStreamingBytes);
                     remainingStreamingBytes -= emittable;
 
diff --git a/uSockets b/uSockets
index d67d75d..215d079 160000
--- a/uSockets
+++ b/uSockets
@@ -1 +1 @@
-Subproject commit d67d75db2c95059cc0f23769de19c9561f450237
+Subproject commit 215d079bb1ef16493886ac779b90cea2b36e1581