fix to previous patch: don't crash when saving in 16bpp

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 6ddd68f0c7cfb69441da9a37452ca44fb5268189..aa150ea4afca0dbf7c5455cc5161142721e50904 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -312,13 +312,15 @@ bool wxStringBase::AllocBeforeWrite(size_t nLen)
       pData->nAllocLength = nLen;
       m_pchData = pData->data();
     }
-
-    // now we have enough space, just update the string length
-    pData->nDataLength = nLen;
   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
 
+  // it doesn't really matter what the string length is as it's going to be
+  // overwritten later but, for extra safety, set it to 0 for now as we may
+  // have some junk in m_pchData
+  GetStringData()->nDataLength = 0;
+
   return true;
 }