Title: [200170] tags/Safari-602.1.30/Source/WebCore
- Revision
- 200170
- Author
- [email protected]
- Date
- 2016-04-27 21:57:15 -0700 (Wed, 27 Apr 2016)
Log Message
Merged r200151. rdar://problem/25964854
Modified Paths
Diff
Modified: tags/Safari-602.1.30/Source/WebCore/ChangeLog (200169 => 200170)
--- tags/Safari-602.1.30/Source/WebCore/ChangeLog 2016-04-28 04:55:46 UTC (rev 200169)
+++ tags/Safari-602.1.30/Source/WebCore/ChangeLog 2016-04-28 04:57:15 UTC (rev 200170)
@@ -1,3 +1,17 @@
+2016-04-27 Babak Shafiei <[email protected]>
+
+ Merge r200151.
+
+ 2016-04-27 Filip Pizlo <[email protected]>
+
+ Speculative fix for null pointer dereference.
+ rdar://problem/25964854
+
+ Reviewed by Michael Saboff.
+
+ * platform/mac/Language.mm:
+ (WebCore::isValidICUCountryCode):
+
2016-04-26 John Wilander <[email protected]>
Support legacy HTTP headers in WebSockets
Modified: tags/Safari-602.1.30/Source/WebCore/platform/mac/Language.mm (200169 => 200170)
--- tags/Safari-602.1.30/Source/WebCore/platform/mac/Language.mm 2016-04-28 04:55:46 UTC (rev 200169)
+++ tags/Safari-602.1.30/Source/WebCore/platform/mac/Language.mm 2016-04-28 04:57:15 UTC (rev 200170)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
