diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-14 18:50:42 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-14 18:50:42 +0200 |
commit | 86e835ca3a251f1d5c2bcc9411bbe16723c1493f (patch) | |
tree | 340a386299b9a2107914577fef1075477ff9deef | |
parent | 8380a17cd61a3e925f1626ec5d66deccdf685692 (diff) | |
parent | 46287fa5e8f2e961e9f9cb48df08d171ea510ec8 (diff) | |
download | rsyslog-86e835ca3a251f1d5c2bcc9411bbe16723c1493f.tar.gz rsyslog-86e835ca3a251f1d5c2bcc9411bbe16723c1493f.tar.xz rsyslog-86e835ca3a251f1d5c2bcc9411bbe16723c1493f.zip |
Merge branch 'beta'
-rw-r--r-- | plugins/imptcp/imptcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c index 90216b5b..6961a696 100644 --- a/plugins/imptcp/imptcp.c +++ b/plugins/imptcp/imptcp.c @@ -262,6 +262,7 @@ destructSrv(ptcpsrv_t *pSrv) { prop.Destruct(&pSrv->pInputName); pthread_mutex_destroy(&pSrv->mutSessLst); + free(pSrv->pszInputName); free(pSrv->port); free(pSrv); } @@ -1071,7 +1072,7 @@ addListner(modConfData_t __attribute__((unused)) *modConf, instanceConf_t *inst) CHKmalloc(pSrv->lstnIP = ustrdup(inst->pszBindAddr)); } pSrv->pRuleset = inst->pBindRuleset; - pSrv->pszInputName = (inst->pszInputName == NULL) ? UCHAR_CONSTANT("imptcp") : ustrdup(inst->pszInputName); + pSrv->pszInputName = ustrdup((inst->pszInputName == NULL) ? UCHAR_CONSTANT("imptcp") : inst->pszInputName); CHKiRet(prop.Construct(&pSrv->pInputName)); CHKiRet(prop.SetString(pSrv->pInputName, pSrv->pszInputName, ustrlen(pSrv->pszInputName))); CHKiRet(prop.ConstructFinalize(pSrv->pInputName)); |