set string length to 0 in AllocBeforeWrite() just to be tidy (replaces patch 1123226)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 6ddd68f0c7cfb69441da9a37452ca44fb5268189..1a86ca3d1b599461da5fc336612a60a7143b6b03 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();
     }
       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
 
   }
 
   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
+  pData->nDataLength = 0;
+

   return true;
 }
 
   return true;
 }