Changeset 128263 in webkit

Timestamp:

Sep 11, 2012 10:02:48 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

WebFrameImpl::client() needs NULL check in WebWorkerClientImpl::openFileSystem
​https://bugs.webkit.org/show_bug.cgi?id=96354

Patch by Taiju Tsuiki <​tzik@chromium.org> on 2012-09-11
Reviewed by Kent Tamura.

Ensure non-NULL before using WebFrameImpl::client().

Source/WebKit/chromium:

Test: fast/filesystem/workers/detached-frame-crash.html

• src/WebWorkerClientImpl.cpp:

(WebKit::WebWorkerClientImpl::openFileSystem):

LayoutTests:

• fast/filesystem/workers/detached-frame-crash-expected.txt: Added.
• fast/filesystem/workers/detached-frame-crash.html: Added.
• fast/filesystem/workers/resources/detached-frame-crash-frame.html: Added.
• fast/filesystem/workers/resources/detached-frame-crash-worker.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/filesystem/workers/detached-frame-crash-expected.txt (added)
• LayoutTests/fast/filesystem/workers/detached-frame-crash.html (added)
• LayoutTests/fast/filesystem/workers/resources (added)
• LayoutTests/fast/filesystem/workers/resources/detached-frame-crash-frame.html (added)
• LayoutTests/fast/filesystem/workers/resources/detached-frame-crash-worker.js (added)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-11  Taiju Tsuiki  <tzik@chromium.org>
+
+        WebFrameImpl::client() needs NULL check in WebWorkerClientImpl::openFileSystem
+        https://bugs.webkit.org/show_bug.cgi?id=96354
+
+        Reviewed by Kent Tamura.
+
+        Ensure non-NULL before using WebFrameImpl::client().
+
+        * fast/filesystem/workers/detached-frame-crash-expected.txt: Added.
+        * fast/filesystem/workers/detached-frame-crash.html: Added.
+        * fast/filesystem/workers/resources/detached-frame-crash-frame.html: Added.
+        * fast/filesystem/workers/resources/detached-frame-crash-worker.js: Added.
+
 2012-09-11  Stephanie Lewis  <slewis@apple.com>
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-11  Taiju Tsuiki  <tzik@chromium.org>
+
+        WebFrameImpl::client() needs NULL check in WebWorkerClientImpl::openFileSystem
+        https://bugs.webkit.org/show_bug.cgi?id=96354
+
+        Reviewed by Kent Tamura.
+
+        Ensure non-NULL before using WebFrameImpl::client().
+
+        Test: fast/filesystem/workers/detached-frame-crash.html
+
+        * src/WebWorkerClientImpl.cpp:
+        (WebKit::WebWorkerClientImpl::openFileSystem):
+
 2012-09-11  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

@@ -58 +58 @@
 #include "FrameLoaderClientImpl.h"
 #include "PlatformMessagePortChannel.h"
+#include "WebFileSystemCallbacks.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
@@ -210 +211 @@
                                          WebFileSystemCallbacks* callbacks)
 {
-     m_webFrame->client()->openFileSystem(m_webFrame, type, size, create, callbacks);
+    if (!m_webFrame->client()) {
+        callbacks->didFail(WebFileErrorAbort);
+        return;
+    }
+    m_webFrame->client()->openFileSystem(m_webFrame, type, size, create, callbacks);
 }