Title: [200151] trunk/Source/WebCore
- Revision
- 200151
- Author
- fpi...@apple.com
- Date
- 2016-04-27 14:25:15 -0700 (Wed, 27 Apr 2016)
Log Message
Speculative fix for null pointer dereference.
rdar://problem/25964854
Reviewed by Michael Saboff.
* platform/mac/Language.mm:
(WebCore::isValidICUCountryCode):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200150 => 200151)
--- trunk/Source/WebCore/ChangeLog 2016-04-27 21:07:06 UTC (rev 200150)
+++ trunk/Source/WebCore/ChangeLog 2016-04-27 21:25:15 UTC (rev 200151)
@@ -1,3 +1,13 @@
+2016-04-27 Filip Pizlo <fpi...@apple.com>
+
+ Speculative fix for null pointer dereference.
+ rdar://problem/25964854
+
+ Reviewed by Michael Saboff.
+
+ * platform/mac/Language.mm:
+ (WebCore::isValidICUCountryCode):
+
2016-04-27 Myles C. Maxfield <mmaxfi...@apple.com>
Clean up Font::removeFromSystemFallbackCache()
Modified: trunk/Source/WebCore/platform/mac/Language.mm (200150 => 200151)
--- trunk/Source/WebCore/platform/mac/Language.mm 2016-04-27 21:07:06 UTC (rev 200150)
+++ trunk/Source/WebCore/platform/mac/Language.mm 2016-04-27 21:25:15 UTC (rev 200151)
@@ -113,6 +113,8 @@
static bool isValidICUCountryCode(NSString* countryCode)
{
+ if (!countryCode)
+ return false;
const char* const* countries = uloc_getISOCountries();
const char* countryUTF8 = [countryCode UTF8String];
for (unsigned i = 0; countries[i]; ++i) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
