Changeset 136208 in webkit

Timestamp:

Nov 29, 2012, 11:58:33 PM (14 years ago)

Author:

timothy_horton@apple.com

Message:

PDFPlugin: Only plain text can be copied out of PDFs
​https://bugs.webkit.org/show_bug.cgi?id=103591
<rdar://problem/12555161>

Reviewed by Alexey Proskuryakov.

Don't write zero-length data to the pasteboard, just skip the item.

As mentioned in the comment, we don't expect this to come up, and would like to know if it does,
so we assert that it doesn't happen in debug builds.

• WebProcess/Plugins/PDF/PDFPlugin.mm:

(WebKit::PDFPlugin::writeItemsToPasteboard):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PDF/PDFPlugin.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-11-29  Tim Horton  <timothy_horton@apple.com>
+
+        PDFPlugin: Only plain text can be copied out of PDFs
+        https://bugs.webkit.org/show_bug.cgi?id=103591
+        <rdar://problem/12555161>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Don't write zero-length data to the pasteboard, just skip the item.
+
+        As mentioned in the comment, we don't expect this to come up, and would like to know if it does,
+        so we assert that it doesn't happen in debug builds.
+
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        (WebKit::PDFPlugin::writeItemsToPasteboard):
+
 2012-11-29  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm

@@ -773 +773 @@
         NSData *data = [items objectAtIndex:i];
 
+        // We don't expect the data for any items to be empty, but aren't completely sure.
+        // Avoid crashing in the SharedMemory constructor in release builds if we're wrong.
+        ASSERT(data.length);
+        if (!data.length)
+            continue;
+
         if ([type isEqualToString:NSStringPboardType] || [type isEqualToString:NSPasteboardTypeString]) {
             RetainPtr<NSString> plainTextString(AdoptNS, [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);