Title: [114566] trunk/Source/WebCore
- Revision
- 114566
- Author
- macpher...@chromium.org
- Date
- 2012-04-18 14:51:48 -0700 (Wed, 18 Apr 2012)
Log Message
Prevent potential null pointer dereference in CSSStyleSelector::applyProperty().
https://bugs.webkit.org/show_bug.cgi?id=84267
Reviewed by Kentaro Hara.
No new tests / code cleanup found via static analysis.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::collectMatchingRulesForList):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114565 => 114566)
--- trunk/Source/WebCore/ChangeLog 2012-04-18 21:45:54 UTC (rev 114565)
+++ trunk/Source/WebCore/ChangeLog 2012-04-18 21:51:48 UTC (rev 114566)
@@ -1,5 +1,17 @@
2012-04-18 Luke Macpherson <macpher...@chromium.org>
+ Prevent potential null pointer dereference in CSSStyleSelector::applyProperty().
+ https://bugs.webkit.org/show_bug.cgi?id=84267
+
+ Reviewed by Kentaro Hara.
+
+ No new tests / code cleanup found via static analysis.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
+2012-04-18 Luke Macpherson <macpher...@chromium.org>
+
Prevent switch case fallthrough in StylePropertySet::getPropertyValue().
https://bugs.webkit.org/show_bug.cgi?id=84266
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (114565 => 114566)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-04-18 21:45:54 UTC (rev 114565)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-04-18 21:51:48 UTC (rev 114566)
@@ -3566,6 +3566,8 @@
return;
case CSSPropertyWebkitLocale: {
HANDLE_INHERIT_AND_INITIAL(locale, Locale);
+ if (!primitiveValue)
+ return;
if (primitiveValue->getIdent() == CSSValueAuto)
m_style->setLocale(nullAtom);
else
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
