Changeset 146723 in webkit

Timestamp:

Mar 23, 2013 6:24:42 PM (11 years ago)

Author:

dcheng@chromium.org

Message:

[Qt] editing/pasteboard/can-read-in-dragstart-event.html and /can-read-in-copy-and-cut-events.html are crashing
​https://bugs.webkit.org/show_bug.cgi?id=113126

Reviewed by Ryosuke Niwa.

Source/WebCore:

The ClipboardQt implementation only allows reading or writing, not both. Attempting to read
when the clipboard is only writable will lead to a crash since the corresponding member will
be null. To prevent crashes, change the asserts to early returns. In the long term, the
correct fix is to unify the m_readableData and m_writableData members.

No new tests since no functionality in Qt port should change.

• platform/qt/ClipboardQt.cpp:

(WebCore::ClipboardQt::getData):
(WebCore::ClipboardQt::types):
(WebCore::ClipboardQt::files):

LayoutTests:

• platform/qt/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/qt/ClipboardQt.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-23  Daniel Cheng  <dcheng@chromium.org>
+
+        [Qt] editing/pasteboard/can-read-in-dragstart-event.html and /can-read-in-copy-and-cut-events.html are crashing
+        https://bugs.webkit.org/show_bug.cgi?id=113126
+
+        Reviewed by Ryosuke Niwa.
+
+        * platform/qt/TestExpectations:
+
 2013-03-22  Peter Kasting  <pkasting@google.com>
 

trunk/LayoutTests/platform/qt/TestExpectations

@@ -2714 +2714 @@
 webkit.org/b/91611 [ Mac Win ] media/media-higher-prio-audio-stream.html [ Skip ]
 
-webkit.org/b/113126 editing/pasteboard/can-read-in-dragstart-event.html [ Crash ]
-webkit.org/b/113126 editing/pasteboard/can-read-in-copy-and-cut-events.html [ Crash ]
+webkit.org/b/113126 editing/pasteboard/can-read-in-dragstart-event.html [ Failure ]
+webkit.org/b/113126 editing/pasteboard/can-read-in-copy-and-cut-events.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-23  Daniel Cheng  <dcheng@chromium.org>
+
+        [Qt] editing/pasteboard/can-read-in-dragstart-event.html and /can-read-in-copy-and-cut-events.html are crashing
+        https://bugs.webkit.org/show_bug.cgi?id=113126
+
+        Reviewed by Ryosuke Niwa.
+
+        The ClipboardQt implementation only allows reading or writing, not both. Attempting to read
+        when the clipboard is only writable will lead to a crash since the corresponding member will
+        be null. To prevent crashes, change the asserts to early returns. In the long term, the
+        correct fix is to unify the m_readableData and m_writableData members.
+
+        No new tests since no functionality in Qt port should change.
+
+        * platform/qt/ClipboardQt.cpp:
+        (WebCore::ClipboardQt::getData):
+        (WebCore::ClipboardQt::types):
+        (WebCore::ClipboardQt::files):
+
 2013-03-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/qt/ClipboardQt.cpp

@@ -156 +156 @@
         return m_readableData->text();
 
-    ASSERT(m_readableData);
+    // FIXME: Per the spec, reading the clipboard in dragstart events should also be allowed.
+    // See https://bugs.webkit.org/show_bug.cgi?id=113126.
+    if (!m_readableData)
+        return String();
+
     QByteArray rawData = m_readableData->data(type);
     QString data = QTextCodec::codecForName("UTF-16")->toUnicode(rawData);
@@ -188 +192 @@
         return ListHashSet<String>();
 
-    ASSERT(m_readableData);
+    // FIXME: Per the spec, reading the clipboard in dragstart events should also be allowed.
+    // See https://bugs.webkit.org/show_bug.cgi?id=113126.
+    if (!m_readableData)
+        return ListHashSet<String>();
+
     ListHashSet<String> result;
     QStringList formats = m_readableData->formats();
@@ -198 +206 @@
 PassRefPtr<FileList> ClipboardQt::files() const
 {
-    if (!canReadData() || !m_readableData->hasUrls())
+    // FIXME: Per the spec, reading the clipboard in dragstart events should also be allowed.
+    // See https://bugs.webkit.org/show_bug.cgi?id=113126.
+    if (!canReadData() || !m_readableData || !m_readableData->hasUrls())
         return FileList::create();