summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--plugins/omrelp/omrelp.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index faa07896..e675e589 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Version 7.4.2 [v7.4-stable] 2013-06-??
- bugfix: RainerScript object required parameters were not properly
checked - this clould result to segfaults on startup if parameters
were missing.
+- bugfix: omrelp potential segfault at startup on invalid config parameters
- bugfix: small memory leak when $uptime property was used
- bugfix: potential segfault on rsyslog termination in imudp
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=456
diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c
index a29def97..3e355464 100644
--- a/plugins/omrelp/omrelp.c
+++ b/plugins/omrelp/omrelp.c
@@ -179,7 +179,8 @@ CODESTARTnewActInst
CHKiRet(doCreateRelpClient(pData));
CODE_STD_FINALIZERnewActInst
- cnfparamvalsDestruct(pvals, &actpblk);
+ if(pvals != NULL)
+ cnfparamvalsDestruct(pvals, &actpblk);
ENDnewActInst
BEGINisCompatibleWithFeature