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 9cb5936e..3d321b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Version 7.5.1 [devel] 2013-06-??
parameters used by GnuTLS
* support for impstats added
* support for setting permitted peers (client authentication) added
+ * bugfix: potential segfault at startup on invalid config parameters
- imjournal: imported patches from 7.4.1
- omprog: add support for command line parameters
- added experimental TCP stream compression (imptcp only, currently)
diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c
index 67cf1c60..a3dac025 100644
--- a/plugins/omrelp/omrelp.c
+++ b/plugins/omrelp/omrelp.c
@@ -296,7 +296,8 @@ CODESTARTnewActInst
CHKiRet(doCreateRelpClient(pData));
CODE_STD_FINALIZERnewActInst
- cnfparamvalsDestruct(pvals, &actpblk);
+ if(pvals != NULL)
+ cnfparamvalsDestruct(pvals, &actpblk);
ENDnewActInst
BEGINisCompatibleWithFeature