From: Carlos Garcia Campos <carlosgc@webkit.org>
Date: Fri, 6 Mar 2015 07:33:11 +0000 (+0000)
Subject: Add NULL check to convertToUTF8String()
X-Git-Tag: archive/raspbian/2.14.3-1+rpi1~1^2^2^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=86f5e8acec1ed72129fbce3ea3b2ba4c8d06bd70;p=webkit2gtk.git

Add NULL check to convertToUTF8String()

===================================================================

Gbp-Pq: Name fix-null-string-conversion.patch
---

diff --git a/Source/WebCore/bindings/gobject/ConvertToUTF8String.cpp b/Source/WebCore/bindings/gobject/ConvertToUTF8String.cpp
index 14df3a69da..7a4f1110de 100644
--- a/Source/WebCore/bindings/gobject/ConvertToUTF8String.cpp
+++ b/Source/WebCore/bindings/gobject/ConvertToUTF8String.cpp
@@ -29,11 +29,14 @@
 
 gchar* convertToUTF8String(WTF::String const& s)
 {
+    if (s.isNull())
+        return 0;
+
     return g_strdup(s.utf8().data());
 }
 
 gchar* convertToUTF8String(WebCore::URL const& s)
 {
-    return g_strdup(s.string().utf8().data());
+    return convertToUTF8String(s.string());
 }
 
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp
index d187c5901f..49a9c59347 100644
--- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp
+++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp
@@ -108,6 +108,9 @@ private:
         // Body shouldn't have any children at this point.
         g_assert(!webkit_dom_node_has_child_nodes(WEBKIT_DOM_NODE(body)));
 
+        // The value of a non-existent attribute should be null, not an empty string
+        g_assert(!webkit_dom_html_body_element_get_background(WEBKIT_DOM_HTML_BODY_ELEMENT(body)));
+
         // Insert one P element.
         WebKitDOMElement* p = webkit_dom_document_create_element(document, "P", 0);
         g_assert(WEBKIT_DOM_IS_HTML_ELEMENT(p));