Changeset 87758 in webkit

Timestamp:

May 31, 2011 3:40:17 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-31 Berend-Jan Wever <​skylined@chromium.org>

Reviewed by Adam Barth.

Add test to make sure an error in requestFileSystem or resolveLocalFileSystemURI
when no error callback is supplied does not cause a NULL ptr.
​https://bugs.webkit.org/show_bug.cgi?id=49539

• fast/filesystem/filesystem-no-callback-null-ptr-crash.html: Added.
• fast/filesystem/filesystem-no-callback-null-ptr-crash-expected.txt: Added.

2011-05-31 B.J. Wever <​skylined@chromium.org>

Reviewed by Adam Barth.

requestFileSystem and resolveLocalFileSystemURI are not checking if
errorCallback is NULL before scheduling a callback on error.
​https://bugs.webkit.org/show_bug.cgi?id=49539

Test: fast/filesystem/filesystem-no-callback-null-ptr-crash.html

• fileapi/DOMFileSystem.cpp: (WebCore::DOMFileSystem::scheduleCallback): Only call callback if one is supplied.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash-expected.txt (added)
• LayoutTests/fast/filesystem/filesystem-no-callback-null-ptr-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/fileapi/DOMFileSystem.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-31  Berend-Jan Wever  <skylined@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add test to make sure an error in requestFileSystem or resolveLocalFileSystemURI
+        when no error callback is supplied does not cause a NULL ptr.
+        https://bugs.webkit.org/show_bug.cgi?id=49539
+
+        * fast/filesystem/filesystem-no-callback-null-ptr-crash.html: Added.
+        * fast/filesystem/filesystem-no-callback-null-ptr-crash-expected.txt: Added.
+
 2011-05-31  Hao Zheng  <zhenghao@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-31  B.J. Wever  <skylined@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        requestFileSystem and resolveLocalFileSystemURI are not checking if
+        errorCallback is NULL before scheduling a callback on error.
+        https://bugs.webkit.org/show_bug.cgi?id=49539
+
+        Test: fast/filesystem/filesystem-no-callback-null-ptr-crash.html
+
+        * fileapi/DOMFileSystem.cpp:
+        (WebCore::DOMFileSystem::scheduleCallback): Only call callback if
+          one is supplied.
+
 2011-05-31  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/fileapi/DOMFileSystem.h

@@ -102 +102 @@
 {
     ASSERT(scriptExecutionContext->isContextThread());
-    ASSERT(callback);
-    scriptExecutionContext->postTask(adoptPtr(new DispatchCallbackTask<CB, CBArg>(callback, arg)));
+    if (callback)
+        scriptExecutionContext->postTask(adoptPtr(new DispatchCallbackTask<CB, CBArg>(callback, arg)));
 }