galeon/galeon-2.0.7-bug418439.patch

   1 diff --git a/mozilla/EventContext.cpp b/mozilla/EventContext.cpp
   2 index a2a0556..7b22394 100644
   3 --- a/mozilla/EventContext.cpp
   4 +++ b/mozilla/EventContext.cpp
   5 @@ -492,12 +492,12 @@ nsresult EventContext::GetCSSBackground (nsIDOMNode *node, nsAString& url)
   6         nsCOMPtr<nsIDOMCSSStyleDeclaration> decl;
   7         rv = viewCSS->GetComputedStyle (element, NS_LITERAL_STRING(""),
   8                                             getter_AddRefs (decl));
   9 -       if (NS_FAILED (rv)) return rv;
  10 +       if (NS_FAILED (rv) || !decl) return rv;
  11
  12         nsCOMPtr<nsIDOMCSSValue> CSSValue;
  13 -       decl->GetPropertyCSSValue (NS_LITERAL_STRING ("background-image"),
  14 +       rv = decl->GetPropertyCSSValue (NS_LITERAL_STRING ("background-image"),
  15                                    getter_AddRefs (CSSValue));
  16 -       if (!CSSValue) return NS_ERROR_FAILURE;
  17 +       if (NS_FAILED (rv) || !CSSValue) return rv;
  18
  19         nsCOMPtr<nsIDOMCSSPrimitiveValue> primitiveValue =
  20                 do_QueryInterface (CSSValue);