summaryrefslogtreecommitdiffstats
path: root/template.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-11-05 10:41:44 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-11-05 10:41:44 +0100
commit71b8b60b220945aa0c2b541bf144182e2bb6e032 (patch)
treee299863295daf0ac8a2bdd6e1198e90683795d8e /template.c
parent7904ef4e377dda677a9e665e20401d8753535fca (diff)
downloadrsyslog-71b8b60b220945aa0c2b541bf144182e2bb6e032.zip
rsyslog-71b8b60b220945aa0c2b541bf144182e2bb6e032.tar.gz
rsyslog-71b8b60b220945aa0c2b541bf144182e2bb6e032.tar.xz
bugfix: segfault when an *empty* template was used
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206 Thanks to David Hill for alerting us.
Diffstat (limited to 'template.c')
-rw-r--r--template.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/template.c b/template.c
index c46d144..06949e4 100644
--- a/template.c
+++ b/template.c
@@ -85,7 +85,7 @@ rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar **ppBuf, size_t *
{
DEFiRet;
struct templateEntry *pTpe;
- int iBuf;
+ size_t iBuf;
unsigned short bMustBeFreed;
uchar *pVal;
size_t iLenVal;
@@ -141,7 +141,15 @@ rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar **ppBuf, size_t *
pTpe = pTpe->pNext;
}
- (*ppBuf)[iBuf] = '\0'; /* space was reserved above (see copy) */
+ if(iBuf == *pLenBuf) {
+ /* in the weired case of an *empty* template, this can happen.
+ * it is debatable if we should really fix it here or simply
+ * forbid that case. However, performance toll is minimal, so
+ * I tend to permit it. -- 201011-05 rgerhards
+ */
+ CHKiRet(ExtendBuf(ppBuf, pLenBuf, iBuf + 1));
+ }
+ (*ppBuf)[iBuf] = '\0';
finalize_it:
RETiRet;