diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-25 14:13:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-25 14:13:08 +0200 |
| commit | 37586536c28ddae9635d15eda9f3fc28d4643747 (patch) | |
| tree | 985e0f457e6a13f443e909e8e4bad605ce138ce8 /runtime/lmsig_gt.c | |
| parent | 2587e2f5eba3d7e6735676b71955cd6d424b0800 (diff) | |
| parent | 34c8827f22bf3db6bbd5b0c86bd23fedd598fea5 (diff) | |
| download | rsyslog-37586536c28ddae9635d15eda9f3fc28d4643747.tar.gz rsyslog-37586536c28ddae9635d15eda9f3fc28d4643747.tar.bz2 rsyslog-37586536c28ddae9635d15eda9f3fc28d4643747.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'runtime/lmsig_gt.c')
| -rw-r--r-- | runtime/lmsig_gt.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/runtime/lmsig_gt.c b/runtime/lmsig_gt.c index e9194c76..116a48d5 100644 --- a/runtime/lmsig_gt.c +++ b/runtime/lmsig_gt.c @@ -89,7 +89,11 @@ SetCnfParam(void *pT, struct nvlst *lst) int i; uchar *cstr; struct cnfparamvals *pvals; + DEFiRet; pvals = nvlstGetParams(lst, &pblk, NULL); + if(pvals == NULL) { + ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS); + } if(Debug) { dbgprintf("sig param blk in lmsig_gt:\n"); cnfparamsPrint(&pblk, pvals); @@ -120,8 +124,10 @@ SetCnfParam(void *pT, struct nvlst *lst) "param '%s'\n", pblk.descr[i].name); } } - cnfparamvalsDestruct(pvals, &pblk); - return RS_RET_OK; +finalize_it: + if(pvals != NULL) + cnfparamvalsDestruct(pvals, &pblk); + RETiRet; } |