From a33c7045d1b9ecc78a617bf0a568ca64a53c814b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 15 Jun 2007 11:26:29 +0000 Subject: [PATCH] don't put invalid UTF-8 data into wxString if Printf() fails in UTF-8 build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/string.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/common/string.cpp b/src/common/string.cpp index 8bb9f91edc..b9456ecee4 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1566,6 +1566,11 @@ static int DoStringPrintfV(wxString& str, if ( !buf ) { // out of memory + + // in UTF-8 build, leaving uninitialized junk in the buffer + // could result in invalid non-empty UTF-8 string, so just + // reset the string to empty on failure: + buf[0] = '\0'; return -1; } @@ -1594,6 +1599,7 @@ static int DoStringPrintfV(wxString& str, // we know that our own implementation of wxVsnprintf() returns -1 // only for a format error - thus there's something wrong with // the user's format string + buf[0] = '\0'; return -1; #else // possibly using system version // assume it only returns error if there is not enough space, but -- 2.45.2