Merge branch 'v4-beta' into v4-devel

Conflicts:
	tests/nettester.c

1 files changed, 4 insertions, 2 deletions

diff --git a/template.c b/template.c
index 832183b0..0116e782 100644
--- a/template.c
+++ b/template.c
@@ -121,8 +121,10 @@ rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar **ppBuf, size_t *
 		if(iBuf + iLenVal + 1 >= *pLenBuf) /* we reserve one char for the final \0! */
 			CHKiRet(ExtendBuf(ppBuf, pLenBuf, iBuf + iLenVal + 1));
 
-		memcpy(*ppBuf + iBuf, pVal, iLenVal);
-		iBuf += iLenVal;
+		if(iLenVal > 0) { /* may be zero depending on property */
+			memcpy(*ppBuf + iBuf, pVal, iLenVal);
+			iBuf += iLenVal;
+		}
 
 		if(bMustBeFreed)
 			free(pVal);