From 5d2ad2f1dbd4f6d54b67a5b26913c96767cdeca6 Mon Sep 17 00:00:00 2001
From: Kevin Ollivier <kevino@theolliviers.com>
Date: Thu, 22 Feb 2007 01:53:23 +0000
Subject: [PATCH] Fix for crash when an invalid font was being mistakenly
identified as valid due to a signed check on an unsigned value, and also
change the wxLogDebug statement, as I was getting crashes with %s and
wxString.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/mac/carbon/font.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 98ce6d7bbd..3c63ecb23b 100644
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -289,9 +289,12 @@ void wxFontRefData::MacFindFont()
{
wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );
- if ( atsfamily == (ATSFontFamilyRef) -1 )
+
+ // ATSFontFamilyRef is an unsigned type, so check against max
+ // for an invalid value, not -1.
+ if ( atsfamily == 0xffffffff )
{
- wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName );
+ wxLogDebug( wxT("ATSFontFamilyFindFromName failed for ") + m_faceName );
m_macFontFamily = GetAppFont();
}
else
--
2.47.2