From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 22 Aug 1998 20:44:07 +0000 (+0000)
Subject: calling insert("") would provoke an assert - now it's just ignored
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cb6780ff0129b790a29c0660e936430b0b063db8

calling insert("") would provoke an assert - now it's just ignored


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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 7739a1b864..0feac4aeeb 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -930,13 +930,15 @@ wxString& wxString::insert(size_t nPos, const wxString& str)
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nPos <= Len() );
 
-  wxString strTmp;
-  char *pc = strTmp.GetWriteBuf(Len() + str.Len());
-  strncpy(pc, c_str(), nPos);
-  strcpy(pc + nPos, str);
-  strcpy(pc + nPos + str.Len(), c_str() + nPos);
-  strTmp.UngetWriteBuf();
-  *this = strTmp;
+  if ( !str.IsEmpty() ) {
+    wxString strTmp;
+    char *pc = strTmp.GetWriteBuf(Len() + str.Len());
+    strncpy(pc, c_str(), nPos);
+    strcpy(pc + nPos, str);
+    strcpy(pc + nPos + str.Len(), c_str() + nPos);
+    strTmp.UngetWriteBuf();
+    *this = strTmp;
+  }
 
   return *this;
 }