Title: [142639] trunk/Source/WebCore
- Revision
- 142639
- Author
- [email protected]
- Date
- 2013-02-12 10:34:43 -0800 (Tue, 12 Feb 2013)
Log Message
[Mac] guard against NULL languages array
https://bugs.webkit.org/show_bug.cgi?id=109595
Reviewed by Dean Jackson.
No new tests, existing tests won't crash if this is correct.
* page/CaptionUserPreferencesMac.mm:
(WebCore::CaptionUserPreferencesMac::preferredLanguages):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (142638 => 142639)
--- trunk/Source/WebCore/ChangeLog 2013-02-12 17:40:28 UTC (rev 142638)
+++ trunk/Source/WebCore/ChangeLog 2013-02-12 18:34:43 UTC (rev 142639)
@@ -1,3 +1,15 @@
+2013-02-12 Eric Carlson <[email protected]>
+
+ [Mac] guard against NULL languages array
+ https://bugs.webkit.org/show_bug.cgi?id=109595
+
+ Reviewed by Dean Jackson.
+
+ No new tests, existing tests won't crash if this is correct.
+
+ * page/CaptionUserPreferencesMac.mm:
+ (WebCore::CaptionUserPreferencesMac::preferredLanguages):
+
2013-02-12 Emil A Eklund <[email protected]>
TransformState::move should not round offset to int
Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm (142638 => 142639)
--- trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm 2013-02-12 17:40:28 UTC (rev 142638)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm 2013-02-12 18:34:43 UTC (rev 142639)
@@ -473,8 +473,10 @@
}
}
+ CFIndex languageCount = 0;
RetainPtr<CFArrayRef> languages(AdoptCF, MACaptionAppearanceCopySelectedLanguages(kMACaptionAppearanceDomainUser));
- CFIndex languageCount = CFArrayGetCount(languages.get());
+ if (languages)
+ languageCount = CFArrayGetCount(languages.get());
if (!languageCount)
return CaptionUserPreferences::preferredLanguages();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
