Changeset 142639 in webkit

Timestamp:

Feb 12, 2013, 10:34:43 AM (14 years ago)

Author:

eric.carlson@apple.com

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/CaptionUserPreferencesMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-12  Eric Carlson  <eric.carlson@apple.com>
+
+        [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  <eae@chromium.org>
 

trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm

@@ -474 +474 @@
     }
 
+    CFIndex languageCount = 0;
     RetainPtr<CFArrayRef> languages(AdoptCF, MACaptionAppearanceCopySelectedLanguages(kMACaptionAppearanceDomainUser));
-    CFIndex languageCount = CFArrayGetCount(languages.get());
+    if (languages)
+        languageCount = CFArrayGetCount(languages.get());
 
     if (!languageCount)