From dd804c52eeb3ae33d48b5afcce37861769b7e81c Mon Sep 17 00:00:00 2001
From: Lothar Braun <code@lobraun.de>
Date: Tue, 26 May 2020 21:27:35 +0200
Subject: [PATCH] TRWPortScanDetector: Provide better error messages on
 bad_alloc

---
 src/modules/analysis/TRWPortscanDetector.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/analysis/TRWPortscanDetector.cpp b/src/modules/analysis/TRWPortscanDetector.cpp
index 513fa64..5719373 100644
--- a/src/modules/analysis/TRWPortscanDetector.cpp
+++ b/src/modules/analysis/TRWPortscanDetector.cpp
@@ -63,7 +63,11 @@ TRWPortscanDetector::TRWPortscanDetector(uint32_t hashbits, uint32_t texppend,
 	msg(LOG_NOTICE, "TRW variables: logeta_0: %f, logeta_1: %f, X_0: %f, X_1: %f", logeta_0, logeta_1, X_0, X_1);
 	lastCleanup = time(0);
 	
-	trwEntries = new list<TRWEntry*>[hashSize];
+	try {
+		trwEntries = new list<TRWEntry*>[hashSize];
+	} catch(std::bad_alloc& ba) {
+		THROWEXCEPTION("Error allocating TRWEntries in TRWPortscanDetector. Try reducing the number of hashbits: %s", ba.what());
+	}
 }
 
 TRWPortscanDetector::~TRWPortscanDetector()