From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Tue, 20 Sep 2005 12:01:54 +0000 (+0000)
Subject: Fix wxGTK crash on startup on 64-bit solaris 10
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/34a35823ea4cb437871c13d0fedf0b98a3a2a873

Fix wxGTK crash on startup on 64-bit solaris 10


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

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 84d09f9931..f58ac65107 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -139,7 +139,11 @@ wxString wxNativeFontInfo::GetFaceName() const
 wxFontFamily wxNativeFontInfo::GetFamily() const
 {
     wxFontFamily ret = wxFONTFAMILY_DEFAULT;
-    char *family_text = g_ascii_strdown( pango_font_description_get_family( description ), -1 );
+    // note: not passing -1 as the 2nd parameter to g_ascii_strdown to work
+    // around a bug in the 64-bit glib shipped with solaris 10, -1 causes it
+    // to try to allocate 2^32 bytes.
+    const char *family_name = pango_font_description_get_family( description );
+    char *family_text = g_ascii_strdown( family_name, family_name ? strlen( family_name ) : 0 );
     // Check for some common fonts, to salvage what we can from the current win32 centric wxFont API:
     if (strncmp( family_text, "monospace", 9 ) == 0)
         ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace"