1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 4ce74e83f35..50b56fcc957 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -1097,8 +1097,15 @@ IceInternal::BasicStream::read(string& v)
     {
 	throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
     }
-    v.assign(reinterpret_cast<const char*>(&(*i)), len);
-    i += len;
+    if(len > 0)
+    {
+       v.assign(reinterpret_cast<const char*>(&(*i)), len);
+       i += len;
+    }
+    else
+    {
+       v.clear();
+    }
 }
 
 void