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 14df3a69daf175910268256999a675e20cb3328a..7a4f1110de41ca0a07b07cf085149d8ee5eaa88b 100644 (file)
--- 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 d187c5901f8f63861ace71a4a60b4b6ba3342142..49a9c5934769f4cded35fc03ecd1aaf0046459da 100644 (file)
--- 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));