bugfix: zero-length strings were not supported in object deserializer

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5926cc3f..7b18ef73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Version 3.15.1 (rgerhards), 2008-04-??
 - disabled atomic operations for the time being because they introduce some
   cross-platform trouble - need to see how to fix this in the best 
   possible way
+- bugfix: zero-length strings were not supported in object
+  deserializer
 - added librelp check via PKG_CHECK thanks to Michael Biebl's patch
 - file relputil.c deleted, is not actually needed
 - added more meaningful error messages to rsyslogd (when some errors
diff --git a/obj.c b/obj.c
index d408c4bb..2f16669a 100644
--- a/obj.c
+++ b/obj.c
@@ -495,7 +495,7 @@ finalize_it:
 }
 
 
-/* de-serialize a string, length must be provided */
+/* de-serialize a string, length must be provided but may be 0 */
 static rsRetVal objDeserializeStr(cstr_t **ppCStr, int iLen, strm_t *pStrm)
 {
 	DEFiRet;
@@ -504,7 +504,7 @@ static rsRetVal objDeserializeStr(cstr_t **ppCStr, int iLen, strm_t *pStrm)
 	cstr_t *pCStr = NULL;
 
 	assert(ppCStr != NULL);
-	assert(iLen > 0);
+	assert(iLen >= 0);
 
 	CHKiRet(rsCStrConstruct(&pCStr));