Changeset 61881 in webkit

Timestamp:

Jun 25, 2010 12:50:04 PM (14 years ago)

Author:

Martin Robinson

Message:

2010-06-25 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Pasteboard code does not take into account the nil character when getting and setting markup/netscape-url data
​https://bugs.webkit.org/show_bug.cgi?id=41221

Take into account null-terminator when getting and setting markup and
Netscape URL pasteboard types. This means that if the selection data
contains the null terminator, it won't be included in the final String.
When setting the pasteboard data the null terminator is now included to
match the behavior of other applications.

• platform/gtk/PasteboardHelper.cpp: (WebCore::PasteboardHelper::getClipboardContents): Create the markup string after using g_strndup to protect against non-null-terminated strings. Use String::fromUTF8 here to ensure that the string is not longer than the first null-terminator. Also fix a small indentation issue. (WebCore::PasteboardHelper::fillSelectionData): Always include the null-terminator when setting pasteboard data manually. This matches the behavior of other browser applications.

2010-06-25 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Pasteboard code does not take into account the nil character when getting and setting markup/netscape-url data
​https://bugs.webkit.org/show_bug.cgi?id=41221

Add a test for this issue which simulates a paste keyboard event into an editable
body. The pasteboard should contain a markup portion containing a null terminator.

• tests/testcopyandpaste.c: (test_info_new): (test_info_destroy): (load_status_cb): (runPasteTestCallback): (window_object_cleared_callback): (pasting_test_get_data_callback): (pasting_test_clear_data_callback): (test_pasting_markup): (main):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/PasteboardHelper.cpp (modified) (3 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/tests/testcopyandpaste.c (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-25  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Pasteboard code does not take into account the nil character when getting and setting markup/netscape-url data
+        https://bugs.webkit.org/show_bug.cgi?id=41221
+
+        Take into account null-terminator when getting and setting markup and
+        Netscape URL pasteboard types. This means that if the selection data
+        contains the null terminator, it won't be included in the final String.
+        When setting the pasteboard data the null terminator is now included to
+        match the behavior of other applications.
+
+        * platform/gtk/PasteboardHelper.cpp:
+        (WebCore::PasteboardHelper::getClipboardContents):
+        Create the markup string after using g_strndup to protect against non-null-terminated
+        strings. Use String::fromUTF8 here to ensure that the string is not longer than the
+        first null-terminator. Also fix a small indentation issue.
+        (WebCore::PasteboardHelper::fillSelectionData):
+        Always include the null-terminator when setting pasteboard data manually. This matches
+        the behavior of other browser applications.
+
 2010-06-25  Sam Magnuson  <smagnuson@netflix.com>
 

trunk/WebCore/platform/gtk/PasteboardHelper.cpp

@@ -115 +115 @@
 
     if (gtk_clipboard_wait_is_target_available(clipboard, gdkMarkupAtom)) {
-       if (GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard, gdkMarkupAtom)) {
-          RefPtr<TextResourceDecoder> decoder(TextResourceDecoder::create("text/plain", "UTF-8", true));
-          String markup(decoder->decode(reinterpret_cast<const char*>(gtk_selection_data_get_data(data)), gtk_selection_data_get_length(data)));
-          markup += decoder->flush();
-          dataObject->setMarkup(markup);
-          gtk_selection_data_free(data);
-       }
+        if (GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard, gdkMarkupAtom)) {
+            // g_strndup guards against selection data that is not null-terminated.
+            GOwnPtr<gchar> markupString(g_strndup(reinterpret_cast<const char*>(gtk_selection_data_get_data(data)), gtk_selection_data_get_length(data)));
+            dataObject->setMarkup(String::fromUTF8(markupString.get()));
+            gtk_selection_data_free(data);
+        }
     }
 
@@ -144 +143 @@
         GOwnPtr<gchar> markup(g_strdup(dataObject->markup().utf8().data()));
         gtk_selection_data_set(selectionData, gdkMarkupAtom, 8,
-            reinterpret_cast<const guchar*>(markup.get()), strlen(markup.get()));
+            reinterpret_cast<const guchar*>(markup.get()), strlen(markup.get()) + 1);
 
     } else if (info == getIdForTargetType(TargetTypeURIList)) {
@@ -167 +166 @@
         GOwnPtr<gchar> resultData(g_strdup(result.utf8().data()));
         gtk_selection_data_set(selectionData, netscapeURLAtom, 8,
-            reinterpret_cast<const guchar*>(resultData.get()), strlen(resultData.get()));
+            reinterpret_cast<const guchar*>(resultData.get()), strlen(resultData.get()) + 1);
 
     } else if (info == getIdForTargetType(TargetTypeImage))

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-06-25  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Pasteboard code does not take into account the nil character when getting and setting markup/netscape-url data
+        https://bugs.webkit.org/show_bug.cgi?id=41221
+
+        Add a test for this issue which simulates a paste keyboard event into an editable
+        body. The pasteboard should contain a markup portion containing a null terminator.
+
+        * tests/testcopyandpaste.c:
+        (test_info_new):
+        (test_info_destroy):
+        (load_status_cb):
+        (runPasteTestCallback):
+        (window_object_cleared_callback):
+        (pasting_test_get_data_callback):
+        (pasting_test_clear_data_callback):
+        (test_pasting_markup):
+        (main):
+
 2010-06-24  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebKit/gtk/tests/testcopyandpaste.c

@@ -31 +31 @@
 typedef struct {
     char* page;
-    char* expectedPlainText;
+    char* expectedContent;
 } TestInfo;
 
@@ -42 +42 @@
 
 TestInfo*
-test_info_new(const char* page, const char* expectedPlainText)
+test_info_new(const char* page, const char* expectedContent)
 {
     TestInfo* info;
     info = g_slice_new0(TestInfo);
     info->page = g_strdup(page);
-    if (expectedPlainText)
-        info->expectedPlainText = g_strdup(expectedPlainText);
+    if (expectedContent)
+        info->expectedContent = g_strdup(expectedContent);
     return info;
 }
@@ -56 +56 @@
 {
     g_free(info->page);
-    g_free(info->expectedPlainText);
+    g_free(info->expectedContent);
     g_slice_free(TestInfo, info);
 }
@@ -90 +90 @@
 
     gchar* text = gtk_clipboard_wait_for_text(clipboard);
-    g_assert(text || !fixture->info->expectedPlainText);
-    g_assert(!text || !strcmp(text, fixture->info->expectedPlainText));
+    g_assert(text || !fixture->info->expectedContent);
+    g_assert(!text || !strcmp(text, fixture->info->expectedContent));
     g_free(text);
 
@@ -124 +124 @@
     g_main_loop_run(fixture->loop);
 }
+
+static CopyAndPasteFixture* currentFixture;
+static JSValueRef runPasteTestCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+    // Simulate a paste keyboard sequence.
+    GdkEvent event;
+    memset(&event, 0, sizeof(event));
+    event.key.keyval = gdk_unicode_to_keyval('v');
+    event.key.state = GDK_CONTROL_MASK;
+    event.key.window = GTK_WIDGET(currentFixture->webView)->window;
+    GdkKeymapKey* keys;
+    gint n_keys;
+    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), event.key.keyval, &keys, &n_keys)) {
+        event.key.hardware_keycode = keys[0].keycode;
+        g_free(keys);
+    }
+    event.key.type = GDK_KEY_PRESS;
+    gtk_main_do_event(&event);
+    event.key.type = GDK_KEY_RELEASE;
+    gtk_main_do_event(&event);
+
+    JSStringRef scriptString = JSStringCreateWithUTF8CString("document.body.innerHTML;");
+    JSValueRef value = JSEvaluateScript(context, scriptString, 0, 0, 0, 0);
+    JSStringRelease(scriptString);
+
+    g_assert(JSValueIsString(context, value));
+    JSStringRef actual = JSValueToStringCopy(context, value, exception);
+    g_assert(!exception || !*exception);
+    g_assert(currentFixture->info->expectedContent);
+    JSStringRef expected = JSStringCreateWithUTF8CString(currentFixture->info->expectedContent);
+    g_assert(JSStringIsEqual(expected, actual));
+
+    JSStringRelease(expected);
+    JSStringRelease(actual);
+    g_main_loop_quit(currentFixture->loop);
+    return JSValueMakeUndefined(context);
+}
+
+static void window_object_cleared_callback(WebKitWebView* web_view, WebKitWebFrame* web_frame, JSGlobalContextRef context, JSObjectRef window_object, gpointer data)
+{
+    JSStringRef name = JSStringCreateWithUTF8CString("runTest");
+    JSObjectRef testComplete = JSObjectMakeFunctionWithCallback(context, name, runPasteTestCallback);
+    JSObjectSetProperty(context, window_object, name, testComplete, kJSPropertyAttributeNone, 0);
+    JSStringRelease(name);
+}
+
+static void pasting_test_get_data_callback(GtkClipboard* clipboard, GtkSelectionData* selection_data, guint info, gpointer data)
+{
+    gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE), 8, (const guchar*) data, strlen((char*)data) + 1);
+}
+
+static void pasting_test_clear_data_callback(GtkClipboard* clipboard, gpointer data)
+{
+    g_free(data);
+}
+
+static void test_pasting_markup(CopyAndPasteFixture* fixture, gconstpointer data)
+{
+    fixture->info = (TestInfo*)data;
+    currentFixture = fixture;
+
+    GtkTargetList* targetList = gtk_target_list_new(0, 0);
+    gtk_target_list_add(targetList, gdk_atom_intern("text/html", FALSE), 0, 0);
+
+    int numberOfTargets = 1;
+    GtkTargetEntry* targetTable = gtk_target_table_new_from_list(targetList, &numberOfTargets);
+    gtk_clipboard_set_with_data(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
+                                targetTable, numberOfTargets,
+                                pasting_test_get_data_callback,
+                                pasting_test_clear_data_callback,
+                                g_strdup(fixture->info->expectedContent));
+    gtk_target_list_unref(targetList);
+    gtk_target_table_free(targetTable, numberOfTargets);
+
+    g_signal_connect(fixture->window, "map-event",
+                     G_CALLBACK(map_event_cb), fixture);
+    g_signal_connect(fixture->webView, "window-object-cleared",
+                     G_CALLBACK(window_object_cleared_callback), fixture);
+
+    gtk_widget_show(fixture->window);
+    gtk_widget_show(GTK_WIDGET(fixture->webView));
+    gtk_window_present(GTK_WINDOW(fixture->window));
+
+    g_main_loop_run(fixture->loop);
+}
+
 
 int main(int argc, char** argv)
@@ -152 +238 @@
                copy_and_paste_fixture_teardown);
 
+    const char* paste_test_html = "<html>"
+        "<body onLoad=\"document.body.focus(); runTest();\" contentEditable=\"true\">"
+        "</body></html>";
+    g_test_add("/webkit/copyandpaste/paste-markup", CopyAndPasteFixture,
+               test_info_new(paste_test_html, "bobby"),
+               copy_and_paste_fixture_setup,
+               test_pasting_markup,
+               copy_and_paste_fixture_teardown);
+
     return g_test_run();
 }