From 32723ecf1e7bd8a4502cea9c1c8e9ba089b4f0a2 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 22 Feb 2008 08:19:54 +0000
Subject: fixed bug in duplicate module load detection

---
 conf.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/conf.c b/conf.c
index 56ceb686..56ba3837 100644
--- a/conf.c
+++ b/conf.c
@@ -215,6 +215,7 @@ doModLoad(uchar **pp, __attribute__((unused)) void* pVal)
         uchar szPath[512];
         uchar errMsg[1024];
 	uchar *pModName, *pModNameBase;
+	uchar *pModNameDup;
         void *pModHdlr, *pModInit;
 	modInfo_t *pModInfo;
 
@@ -241,16 +242,20 @@ doModLoad(uchar **pp, __attribute__((unused)) void* pVal)
 
 	dbgprintf("Requested to load module '%s'\n", szName);
 
-	pModNameBase = (uchar *) basename(strdup((char *) pModName));
+	if((pModNameDup = (uchar *) strdup((char *) pModName)) == NULL)
+		ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
+
+	pModNameBase = (uchar *) basename((char*)pModNameDup);
 	pModInfo = modGetNxt(NULL);
 	while(pModInfo != NULL) {
 		if(!strcmp((char *) pModNameBase, (char *) modGetName(pModInfo))) {
 			dbgprintf("Module '%s' already loaded\n", szName);
+			free(pModNameDup);
 			ABORT_FINALIZE(RS_RET_OK);
 		}
 		pModInfo = modGetNxt(pModInfo);
 	}
-	free(pModNameBase);
+	free(pModNameDup);
 
 	if(*pModName == '/') {
 		*szPath = '\0';	/* we do not need to append the path - its already in the module name */
@@ -641,7 +646,6 @@ static rsRetVal cflineProcessTradPRIFilter(uchar **pline, register selector_t *f
 		}
 
 		if (pri < 0) {
-dbgPrintAllDebugInfo();
 			snprintf((char*) xbuf, sizeof(xbuf), "unknown priority name \"%s\"", buf);
 			logerror((char*) xbuf);
 			return RS_RET_ERR;
-- 
cgit v1.2.3