Attachment 627302 Details for Bug 865779 – Patch that should fix this bug

[patch] Patch that should fix this bug

kdelibs-4.3.4-CVE-2012-4512.patch (text/plain), 990 bytes, created by Jan Grulich on 2012-10-15 11:09:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Grulich

Created: 2012-10-15 11:09:07 UTC

Size: 990 bytes

patch

obsolete

>diff -rup kdelibs-4.3.4/khtml/css/cssparser.cpp kdelibs-4.3.4_fix/khtml/css/cssparser.cpp
>--- kdelibs-4.3.4/khtml/css/cssparser.cpp	2009-07-29 13:09:43.000000000 +0200
>+++ kdelibs-4.3.4_fix/khtml/css/cssparser.cpp	2012-10-15 12:09:39.095465555 +0200
>@@ -2219,8 +2219,11 @@ bool CSSParser::parseFontFaceSrc()
>             expectComma = true;
>         } else if (val->unit == Value::Function) {
>             // There are two allowed functions: local() and format().
>+            // For both we expect a string argument
>             ValueList *args = val->function->args;
>-            if (args && args->size() == 1) {
>+            if (args && args->size() == 1 &&
>+                (args->current()->unit == CSSPrimitiveValue::CSS_STRING ||
>+                 args->current()->unit == CSSPrimitiveValue::CSS_IDENT)) {
>                 if (!strcasecmp(domString(val->function->name), "local(") && !expectComma) {
>                     expectComma = true;
>                     allowFormat = false;

Actions: View | Diff

Attachments on bug 865779: 627302