Changeset 119702 in webkit

Timestamp:

Jun 7, 2012 4:06:58 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

FileAPI: If type consists of non-ASCII characters in Blob constructor, it should throw a SyntaxError.
​https://bugs.webkit.org/show_bug.cgi?id=88411

Patch by Li Yin <​li.yin@intel.com> on 2012-06-07
Reviewed by Kentaro Hara.

Source/WebCore:

From spec: ​http://dev.w3.org/2006/webapi/FileAPI/#constructorBlob
If type consists of any non-ASCII characters, throw a SyntaxError and
return from this algorithm.
This patch checks the String is ASCii or not, if not, throw SyntaxError.

Test: fast/files/blob-constructor.html

• bindings/js/JSBlobCustom.cpp:

(WebCore::JSBlobConstructor::constructJSBlob):

• bindings/v8/custom/V8BlobCustom.cpp:

(WebCore::V8Blob::constructorCallback):

LayoutTests:

From Spec: ​http://dev.w3.org/2006/webapi/FileAPI/#constructorBlob
If type consists of any non-ASCII characters, throw a SyntaxError and
return from this algorithm.

• fast/files/blob-constructor-expected.txt:
• fast/files/script-tests/blob-constructor.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/files/blob-constructor-expected.txt (modified) (1 diff)
• LayoutTests/fast/files/script-tests/blob-constructor.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSBlobCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/v8/custom/V8BlobCustom.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-07  Li Yin  <li.yin@intel.com>
+
+        FileAPI: If type consists of non-ASCII characters in Blob constructor, it should throw a SyntaxError.
+        https://bugs.webkit.org/show_bug.cgi?id=88411
+
+        Reviewed by Kentaro Hara.
+
+        From Spec: http://dev.w3.org/2006/webapi/FileAPI/#constructorBlob
+        If type consists of any non-ASCII characters, throw a SyntaxError and
+        return from this algorithm.
+
+        * fast/files/blob-constructor-expected.txt:
+        * fast/files/script-tests/blob-constructor.js:
+
 2012-06-07  Arpita Bahuguna  <arpitabahuguna@gmail.com>
 

trunk/LayoutTests/fast/files/blob-constructor-expected.txt

@@ -29 +29 @@
 PASS new Blob([], {endings:throwingObj}) threw exception Error.
 PASS new Blob([], {type:throwingObj}) threw exception Error.
+PASS new Blob([], {type:'helloî'}) threw exception SyntaxError: type must consist of ASCII characters.
 PASS new Blob([], {endings:throwingObj1, type:throwingObj2}) threw exception Error 1.
 PASS new Blob([], {type:throwingObj2, endings:throwingObj1}) threw exception Error 1.

trunk/LayoutTests/fast/files/script-tests/blob-constructor.js

@@ -39 +39 @@
 shouldThrow("new Blob([], {endings:throwingObj})", "'Error'");
 shouldThrow("new Blob([], {type:throwingObj})", "'Error'");
+shouldThrow("new Blob([], {type:'hello\u00EE'})", "'SyntaxError: type must consist of ASCII characters'");
 
 // Test that order of property bag evaluation is lexigraphical

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-07  Li Yin  <li.yin@intel.com>
+
+        FileAPI: If type consists of non-ASCII characters in Blob constructor, it should throw a SyntaxError.
+        https://bugs.webkit.org/show_bug.cgi?id=88411
+
+        Reviewed by Kentaro Hara.
+
+        From spec: http://dev.w3.org/2006/webapi/FileAPI/#constructorBlob
+        If type consists of any non-ASCII characters, throw a SyntaxError and
+        return from this algorithm.
+        This patch checks the String is ASCii or not, if not, throw SyntaxError.
+
+        Test: fast/files/blob-constructor.html
+
+        * bindings/js/JSBlobCustom.cpp:
+        (WebCore::JSBlobConstructor::constructJSBlob):
+        * bindings/v8/custom/V8BlobCustom.cpp:
+        (WebCore::V8Blob::constructorCallback):
+
 2012-06-07  Arpita Bahuguna  <arpitabahuguna@gmail.com>
 

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

@@ -104 +104 @@
         if (exec->hadException())
             return JSValue::encode(jsUndefined());
+        if (!type.containsOnlyASCII())
+            return throwVMError(exec, createSyntaxError(exec, "type must consist of ASCII characters"));
     }
 

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

@@ -103 +103 @@
         if (tryCatchType.HasCaught())
             return throwError(tryCatchType.Exception(), args.GetIsolate());
+        if (!type.containsOnlyASCII())
+            return V8Proxy::throwError(V8Proxy::SyntaxError, "type must consist of ASCII characters", args.GetIsolate());
     }