Changeset 101606 in webkit

Timestamp:

Nov 30, 2011 9:44:30 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[FileSystem API] DirectoryEntry.getFile path argument is required
​https://bugs.webkit.org/show_bug.cgi?id=69642

Patch by Mark Pilgrim <​pilgrim@chromium.org> on 2011-11-30
Reviewed by Adam Barth.

Source/WebCore:

Test: fast/filesystem/simple-required-arguments-getfile.html

• bindings/js/JSDirectoryEntryCustom.cpp:

(WebCore::JSDirectoryEntry::getFile): check args length and throw TypeError if not enough arguments

• bindings/v8/custom/V8DirectoryEntryCustom.cpp:

(WebCore::V8DirectoryEntry::getFileCallback): check args length and throw TypeError if not enough arguments

LayoutTests:

• fast/filesystem/resources/simple-required-arguments-getfile.js: Added.

(errorCallback):
(successCallback):

• fast/filesystem/simple-required-arguments-getfile-expected.txt: Added.
• fast/filesystem/simple-required-arguments-getfile.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/filesystem/resources/simple-required-arguments-getfile.js (added)
• LayoutTests/fast/filesystem/simple-required-arguments-getfile-expected.txt (added)
• LayoutTests/fast/filesystem/simple-required-arguments-getfile.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDirectoryEntryCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/v8/custom/V8DirectoryEntryCustom.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-30  Mark Pilgrim  <pilgrim@chromium.org>
+
+        [FileSystem API] DirectoryEntry.getFile path argument is required
+        https://bugs.webkit.org/show_bug.cgi?id=69642
+
+        Reviewed by Adam Barth.
+
+        * fast/filesystem/resources/simple-required-arguments-getfile.js: Added.
+        (errorCallback):
+        (successCallback):
+        * fast/filesystem/simple-required-arguments-getfile-expected.txt: Added.
+        * fast/filesystem/simple-required-arguments-getfile.html: Added.
+
 2011-11-30  Rafael Weinstein  <rafaelw@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-30  Mark Pilgrim  <pilgrim@chromium.org>
+
+        [FileSystem API] DirectoryEntry.getFile path argument is required
+        https://bugs.webkit.org/show_bug.cgi?id=69642
+
+        Reviewed by Adam Barth.
+
+        Test: fast/filesystem/simple-required-arguments-getfile.html
+
+        * bindings/js/JSDirectoryEntryCustom.cpp:
+        (WebCore::JSDirectoryEntry::getFile): check args length and throw TypeError if not enough arguments
+        * bindings/v8/custom/V8DirectoryEntryCustom.cpp:
+        (WebCore::V8DirectoryEntry::getFileCallback): check args length and throw TypeError if not enough arguments
+
 2011-11-30  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/bindings/js/JSDirectoryEntryCustom.cpp

@@ -48 +48 @@
 JSValue JSDirectoryEntry::getFile(ExecState* exec)
 {
+    if (exec->argumentCount() < 1)
+        return throwError(exec, createTypeError(exec, "Not enough arguments"));
+
     DirectoryEntry* imp = static_cast<DirectoryEntry*>(impl());
     const String& path = valueToStringWithUndefinedOrNullCheck(exec, exec->argument(0));

trunk/Source/WebCore/bindings/v8/custom/V8DirectoryEntryCustom.cpp

@@ -94 +94 @@
     INC_STATS("DOM.DirectoryEntry.getFile");
     DirectoryEntry* imp = V8DirectoryEntry::toNative(args.Holder());
+
+    if (args.Length() < 1)
+        return throwError("Not enough arguments", V8Proxy::TypeError);
+
     STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<WithUndefinedOrNullCheck>, path, args[0]);
     if (args.Length() <= 1) {