commit 2da7ed0ba7ed78d0ccaca0a65fc07cfe202a9ed3
author Ben Murdoch <benm@google.com> Thu Oct 21 17:25:55 2010 +0100
committer Ben Murdoch <benm@google.com> Thu Oct 21 17:26:10 2010 +0100
tree 5c40ea99586b8b9a0cf8f5c6e14865152f767ca2
parent ee4c9585fe53aff7a0aa833b9a5d3e861e16578e

Cherry-pick WebKit security fix (webkit.org r67967) Do not merge

See http://trac.webkit.org/changeset/67967

Note this is only a partial cherry pick of r67967 as it is
based on a CL later than our current revision and not all
deltas are relevant.

Change-Id: I7d153c9470abb2b0994900b2c5909fded4a94752

WebCore/editing/ApplyStyleCommand.cpp

diff --git a/WebCore/editing/ApplyStyleCommand.cpp b/WebCore/editing/ApplyStyleCommand.cpp
index 1c739ec..093c15c 100644
--- a/WebCore/editing/ApplyStyleCommand.cpp
+++ b/WebCore/editing/ApplyStyleCommand.cpp
@@ -182,8 +182,8 @@
 
     // Assuming reconcileTextDecorationProperties has been called, there should not be -webkit-text-decorations-in-effect
     // Furthermore, text-decoration: none has been trimmed so that text-decoration property is always a CSSValueList.
-    if (RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(CSSPropertyTextDecoration)) {
-        ASSERT(textDecoration->isValueList());
+    RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(CSSPropertyTextDecoration);
+    if (textDecoration && textDecoration->isValueList()) {
         DEFINE_STATIC_LOCAL(RefPtr<CSSPrimitiveValue>, underline, (CSSPrimitiveValue::createIdentifier(CSSValueUnderline)));
         DEFINE_STATIC_LOCAL(RefPtr<CSSPrimitiveValue>, lineThrough, (CSSPrimitiveValue::createIdentifier(CSSValueLineThrough)));