From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 18 Sep 2005 16:50:47 +0000 (+0000)
Subject: don't pass NULL pointer to printf(), this crashes Solaris printf
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0944fceb987def04dc89d03d58c35793d0ecdfed

don't pass NULL pointer to printf(), this crashes Solaris printf


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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 878e909465..76a1931763 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1429,10 +1429,11 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
                 // VS: we must not output an error here, since wxWidgets will safely
                 //     fall back to using wxEncodingConverter.
                 wxLogTrace(TRACE_STRCONV, wxT("Impossible to convert to/from charset '%s' with iconv, falling back to wxEncodingConverter."), name);
-                //wxLogError(
             }
         }
-        wxLogTrace(TRACE_STRCONV, wxT("wchar_t charset is '%s', needs swap: %i"), ms_wcCharsetName, ms_wcNeedsSwap);
+        wxLogTrace(TRACE_STRCONV,
+                   wxT("wchar_t charset is '%s', needs swap: %i"),
+                   ms_wcCharsetName ? ms_wcCharsetName : "<none>", ms_wcNeedsSwap);
     }
     else // we already have ms_wcCharsetName
     {