Changeset 122228 in webkit

Timestamp:

Jul 10, 2012 9:18:40 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Editing: Reproducible crasher when pasting a 0x0 image into Mail
​https://bugs.webkit.org/show_bug.cgi?id=90640
<rdar://problem/11141920>

Patch by Alice Cheng <​alice_cheng@apple.com> on 2012-07-10
Reviewed by Brady Eidson.

Source/WebCore:

0x0 images don't get a resource representation in the WebArchive, so we need a null check

Test: TestWebKitAPI/Tests/mac/0.png

TestWebKitAPI/Tests/mac/WebViewCanPasteZeroPng.mm

• platform/mac/PasteboardMac.mm:

(WebCore::documentFragmentWithImageResource):

Tools:

Test cases for the patch. 0x0 images don't get a resource representation in the WebArchive, so we need a null check.

• TestWebKitAPI/Tests/mac/0.png: Added.
• TestWebKitAPI/Tests/mac/WebViewCanPasteZeroPng.mm: Added.

(TestWebKitAPI):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mac/PasteboardMac.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/mac/0.png (added)
• Tools/TestWebKitAPI/Tests/mac/WebViewCanPasteZeroPng.mm (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-10  Alice Cheng  <alice_cheng@apple.com>
+
+        Editing: Reproducible crasher when pasting a 0x0 image into Mail
+        https://bugs.webkit.org/show_bug.cgi?id=90640
+        <rdar://problem/11141920>
+
+        Reviewed by Brady Eidson.
+
+        0x0 images don't get a resource representation in the WebArchive, so we need a null check
+
+        Test: TestWebKitAPI/Tests/mac/0.png
+              TestWebKitAPI/Tests/mac/WebViewCanPasteZeroPng.mm
+
+        * platform/mac/PasteboardMac.mm:
+        (WebCore::documentFragmentWithImageResource):
+
 2012-07-10  Nikita Vasilyev  <me@elv1s.ru>
 

trunk/Source/WebCore/platform/mac/PasteboardMac.mm

@@ -369 +369 @@
 static PassRefPtr<DocumentFragment> documentFragmentWithImageResource(Frame* frame, PassRefPtr<ArchiveResource> resource)
 {
+    if (!resource)
+        return 0;
+    
     if (DocumentLoader* loader = frame->loader()->documentLoader())
         loader->addArchiveResource(resource.get());

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-10  Alice Cheng  <alice_cheng@apple.com>
+
+        Editing: Reproducible crasher when pasting a 0x0 image into Mail
+        https://bugs.webkit.org/show_bug.cgi?id=90640
+        <rdar://problem/11141920>
+
+        Reviewed by Brady Eidson.
+
+        Test cases for the patch. 0x0 images don't get a resource representation in the WebArchive, so we need a null check.
+
+        * TestWebKitAPI/Tests/mac/0.png: Added.
+        * TestWebKitAPI/Tests/mac/WebViewCanPasteZeroPng.mm: Added.
+        (TestWebKitAPI):
+        (TestWebKitAPI::TEST):
+
 2012-07-10  Leandro Gracia Gil  <leandrogracia@chromium.org>