Changeset 56214

Timestamp:

10/10/08 09:11:40 (3 months ago)

Author:

VZ

Message:

don't crash when streaming out a wxString into an std::ostream, just set the failbit instead

Files:

• wxWidgets/trunk/src/common/string.cpp (modified) (1 diff)

wxWidgets/trunk/src/common/string.cpp

@@ -169 +169 @@
 {
 #if wxUSE_UNICODE && !wxUSE_UNICODE_UTF8
-    return os << (const char *)str.AsCharBuf();
+    const wxCharBuffer buf(str.AsCharBuf());
+    if ( !buf )
+        os.clear(wxSTD ios_base::failbit);
+    else
+        os << buf.data();
+
+    return os;
 #else
     return os << str.AsInternal();