don't use strlen() to verify the length of the string as it can contain embedded...

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 52fc61910b081158361790d7509d6452b0ad69bb..cf4e0a5be555a94bb9ccf9090612ccf400f95d6f 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -1199,7 +1199,11 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
         return lenMax+1;     // not enough space in the output buffer !
     }
 
         return lenMax+1;     // not enough space in the output buffer !
     }
 

-    wxASSERT(lenCur == wxStrlen(buf));
+    // Don't do:
+    //      wxASSERT(lenCur == wxStrlen(buf));
+    // in fact if we embedded NULLs in the output buffer (using %c with a '\0')
+    // such check would fail
+

     return lenCur;
 }
 
     return lenCur;
 }