diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-04 16:43:21 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-04 16:43:21 +0100 |
| commit | ef193bf0ae75d206e4b50022f8c07e3b908c8491 (patch) | |
| tree | 2ea9d48da9884b532e02a129565b68f648105280 /runtime | |
| parent | 66d129c9ca24f6f3001fad9cc854c54a360df49e (diff) | |
| parent | 8c3ab2e26f1bae46ff34fc1d0a10a69c4db78127 (diff) | |
| download | rsyslog-ef193bf0ae75d206e4b50022f8c07e3b908c8491.tar.gz rsyslog-ef193bf0ae75d206e4b50022f8c07e3b908c8491.tar.xz rsyslog-ef193bf0ae75d206e4b50022f8c07e3b908c8491.zip | |
Merge branch 'v4-stable' into v4-beta
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 8 | ||||
| -rw-r--r-- | runtime/vm.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index b92664a1..ef795237 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -513,7 +513,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; @@ -550,10 +550,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; diff --git a/runtime/vm.c b/runtime/vm.c index d7cd52d5..aaf3c879 100644 --- a/runtime/vm.c +++ b/runtime/vm.c @@ -88,6 +88,9 @@ rsfrAddFunction(uchar *szName, prsf_t rsf) funcRegRoot = pEntry; finalize_it: + if(iRet != RS_RET_OK && iRet != RS_RET_DUP_FUNC_NAME) + free(pEntry); + RETiRet; } |