diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-04 16:51:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-04 16:51:43 +0100 |
| commit | d71e8672c90628fdfa58ad860833d78cfd5941d8 (patch) | |
| tree | 3706d77ffcf7c97c6cf75aa61453cf677e531a88 /runtime/conf.c | |
| parent | 90455378415e06bfee9109c77b8a595da1326f78 (diff) | |
| parent | ef193bf0ae75d206e4b50022f8c07e3b908c8491 (diff) | |
| download | rsyslog-d71e8672c90628fdfa58ad860833d78cfd5941d8.tar.gz rsyslog-d71e8672c90628fdfa58ad860833d78cfd5941d8.tar.xz rsyslog-d71e8672c90628fdfa58ad860833d78cfd5941d8.zip | |
Merge branch 'v4-beta' into beta
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index e7c1576f..96d9dcab 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -512,7 +512,7 @@ finalize_it: rsRetVal cflineParseTemplateName(uchar** pp, omodStringRequest_t *pOMSR, int iEntry, int iTplOpts, uchar *dfltTplName) { uchar *p; - uchar *tplName; + uchar *tplName = NULL; cstr_t *pStrB; DEFiRet; @@ -549,10 +549,12 @@ rsRetVal cflineParseTemplateName(uchar** pp, omodStringRequest_t *pOMSR, int iEn CHKiRet(cstrConvSzStrAndDestruct(pStrB, &tplName, 0)); } - iRet = OMSRsetEntry(pOMSR, iEntry, tplName, iTplOpts); - if(iRet != RS_RET_OK) goto finalize_it; + CHKiRet(OMSRsetEntry(pOMSR, iEntry, tplName, iTplOpts)); finalize_it: + if(iRet != RS_RET_OK) + free(tplName); + *pp = p; RETiRet; |