From: Giuseppe Longo <glongo@stamus-networks.com>
Date: Wed, 13 Dec 2017 11:26:35 +0000 (+0100)
Subject: stream-tcp-reassemble: declare 'size' as uint64_t
X-Git-Tag: suricata-4.1.0-beta1~444
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a75eaf40590bfd5bf276482abea710b117a55da;p=thirdparty%2Fsuricata.git

stream-tcp-reassemble: declare 'size' as uint64_t

According to all checking memcap functions,
the size passed as argument is declared as uint64_t
except for StreamTcpReassembleCheckMemcap where it's
defined as uint32_t.
---

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 2128cf54f7..f7eb8be450 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -143,7 +143,7 @@ uint64_t StreamTcpReassembleMemuseGlobalCounter(void)
  * \retval 1 if in bounds
  * \retval 0 if not in bounds
  */
-int StreamTcpReassembleCheckMemcap(uint32_t size)
+int StreamTcpReassembleCheckMemcap(uint64_t size)
 {
     if (stream_config.reassembly_memcap == 0 ||
             (uint64_t)((uint64_t)size + SC_ATOMIC_GET(ra_memuse)) <= stream_config.reassembly_memcap)
diff --git a/src/stream-tcp-reassemble.h b/src/stream-tcp-reassemble.h
index 7c5e8bb1d4..885e86cfea 100644
--- a/src/stream-tcp-reassemble.h
+++ b/src/stream-tcp-reassemble.h
@@ -114,7 +114,7 @@ int StreamTcpReassembleDepthReached(Packet *p);
 
 void StreamTcpReassembleIncrMemuse(uint64_t size);
 void StreamTcpReassembleDecrMemuse(uint64_t size);
-int StreamTcpReassembleCheckMemcap(uint32_t size);
+int StreamTcpReassembleCheckMemcap(uint64_t size);
 uint64_t StreamTcpReassembleMemuseGlobalCounter(void);
 
 void StreamTcpDisableAppLayer(Flow *f);