summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-07-18 10:49:27 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-07-18 10:49:27 +0000
commit48c0c81132fe0b4aadf46fd54fc5acd61bfbeffa (patch)
tree7cc726aed7393ecdb22be545dbe8b3c400deb8d4
parent7a2eb66a0a0fde6ed263a035eb2eeeba483c604b (diff)
downloadrsyslog-48c0c81132fe0b4aadf46fd54fc5acd61bfbeffa.tar.gz
rsyslog-48c0c81132fe0b4aadf46fd54fc5acd61bfbeffa.tar.xz
rsyslog-48c0c81132fe0b4aadf46fd54fc5acd61bfbeffa.zip
fixed minimal memory leak on HUP (caused by templates) thanks to
varmojfekoj for the patch
-rw-r--r--ChangeLog3
-rw-r--r--syslogd.c5
-rw-r--r--template.c51
-rw-r--r--template.h1
4 files changed, 59 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea55873e..b6812057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ Version 1.17.1 (RGer), 2007-07-??
- fixed bug that caused $AllowedSenders to handle IPv6 scopes incorrectly;
also fixed but that could grabble $AllowedSender wildcards. Thanks to
mildew@gmail.com for the patch
+- minor code cleanup - thanks to Peter Vrabec for the patch
+- fixed minimal memory leak on HUP (caused by templates)
+ thanks to varmojfekoj <varmojfekoj@gmail.com> for the patch
---------------------------------------------------------------------------
Version 1.17.0 (RGer), 2007-07-17
- added $RepeatedLineReduction config parameter
diff --git a/syslogd.c b/syslogd.c
index 2c05b0cc..6164d25a 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -7913,6 +7913,9 @@ static void init()
/* Reflect the deletion of the Files linked list. */
Files = NULL;
}
+
+ dprintf("Clearing templates.\n");
+ tplDeleteNew();
f = NULL;
nextp = NULL;
@@ -10233,7 +10236,7 @@ int main(int argc, char **argv)
pTmp = template_StdUsrMsgFmt;
tplAddLine(" StdUsrMsgFmt", &pTmp);
pTmp = template_StdDBFmt;
- tplAddLine(" StdDBFmt", &pTmp);
+ tplLastStaticInit(tplAddLine(" StdDBFmt", &pTmp));
/* prepare emergency logging system */
diff --git a/template.c b/template.c
index 19857866..495597ac 100644
--- a/template.c
+++ b/template.c
@@ -21,6 +21,7 @@
static struct template *tplRoot = NULL; /* the root of the template list */
static struct template *tplLast = NULL; /* points to the last element of the template list */
+static struct template *tplLastStatic = NULL; /* last static element of the template list */
/* Constructs a template entry object. Returns pointer to it
* or NULL (if it fails). Pointer to associated template list entry
@@ -629,6 +630,56 @@ void tplDeleteAll(void)
}
}
+/* Destroy all templates obtained from conf file
+ * preserving hadcoded ones. This is called from init().
+ */
+void tplDeleteNew(void)
+{
+ struct template *pTpl, *pTplDel;
+ struct templateEntry *pTpe, *pTpeDel;
+
+ if(tplRoot == NULL || tplLastStatic == NULL)
+ return;
+
+ pTpl = tplLastStatic->pNext;
+ tplLastStatic->pNext = NULL;
+ tplLast = tplLastStatic;
+ while(pTpl != NULL) {
+ /* dprintf("Delete Template: Name='%s'\n ", pTpl->pszName == NULL? "NULL" : pTpl->pszName);*/
+ pTpe = pTpl->pEntryRoot;
+ while(pTpe != NULL) {
+ pTpeDel = pTpe;
+ pTpe = pTpe->pNext;
+ /*dprintf("\tDelete Entry(%x): type %d, ", (unsigned) pTpeDel, pTpeDel->eEntryType);*/
+ switch(pTpeDel->eEntryType) {
+ case UNDEFINED:
+ /*dprintf("(UNDEFINED)");*/
+ break;
+ case CONSTANT:
+ /*dprintf("(CONSTANT), value: '%s'",
+ pTpeDel->data.constant.pConstant);*/
+ free(pTpeDel->data.constant.pConstant);
+ break;
+ case FIELD:
+ /*dprintf("(FIELD), value: '%s'", pTpeDel->data.field.pPropRepl);*/
+ free(pTpeDel->data.field.pPropRepl);
+ break;
+ }
+ /*dprintf("\n");*/
+ free(pTpeDel);
+ }
+ pTplDel = pTpl;
+ pTpl = pTpl->pNext;
+ if(pTplDel->pszName != NULL)
+ free(pTplDel->pszName);
+ free(pTplDel);
+ }
+}
+
+/* Store the pointer to the last hardcoded teplate */
+void tplLastStaticInit(struct template *tpl) {
+ tplLastStatic = tpl;
+}
/* Print the template structure. This is more or less a
* debug or test aid, but anyhow I think it's worth it...
diff --git a/template.h b/template.h
index 0e707eff..6ca984f3 100644
--- a/template.h
+++ b/template.h
@@ -67,6 +67,7 @@ struct template *tplAddLine(char* pName, unsigned char** pRestOfConfLine);
struct template *tplFind(char *pName, int iLenName);
int tplGetEntryCount(struct template *pTpl);
void tplDeleteAll(void);
+void tplDeleteNew(void);
void tplPrintList(void);
/*