From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Mon, 6 May 2019 20:54:33 +0000 (-0400)
Subject: Merge pull request #1598 in SNORT/snort3 from ~MIREDDEN/snort3:port_scan_memcap to... 
X-Git-Tag: 3.0.0-256~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f938f1c98909a9801c6506319f534339d08ed61;p=thirdparty%2Fsnort3.git

Merge pull request #1598 in SNORT/snort3 from ~MIREDDEN/snort3:port_scan_memcap to master

Squashed commit of the following:

commit 300ad4844bc61bfacbb746ce036018ae211b7777
Author: Mike Redden <miredden@cisco.com>
Date:   Mon May 6 13:46:13 2019 -0400

    port_scan: Change minimum memcap value to 1024 to avoid divide by zero crash
---

diff --git a/src/network_inspectors/port_scan/ps_module.cc b/src/network_inspectors/port_scan/ps_module.cc
index f7ff05edb..9f49d128e 100644
--- a/src/network_inspectors/port_scan/ps_module.cc
+++ b/src/network_inspectors/port_scan/ps_module.cc
@@ -59,7 +59,7 @@ static const Parameter scan_params[] =
 
 static const Parameter ps_params[] =
 {
-    { "memcap", Parameter::PT_INT, "1:maxSZ", "1048576",
+    { "memcap", Parameter::PT_INT, "1024:maxSZ", "1048576",
       "maximum tracker memory in bytes" },
 
     { "protos", Parameter::PT_MULTI, protos, "all",