Reflect.apply should not allow primitive as the third argument, close

#194
zloirock · Apr 27, 2016 · 184047d · 184047d
1 parent 1cb3f6b
commit 184047d
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 10 deletions.
diff --git a/library/modules/es6.reflect.apply.js b/library/modules/es6.reflect.apply.js
@@ -1,9 +1,11 @@
 // 26.1.1 Reflect.apply(target, thisArgument, argumentsList)
-var $export = require('./_export')
-  , _apply  = Function.apply;
+var $export   = require('./_export')
+  , aFunction = require('./_a-function')
+  , anObject  = require('./_an-object')
+  , _apply    = Function.apply;
 
 $export($export.S, 'Reflect', {
   apply: function apply(target, thisArgument, argumentsList){
-    return _apply.call(target, thisArgument, argumentsList);
+    return _apply.call(aFunction(target), thisArgument, anObject(argumentsList));
   }
 });
diff --git a/modules/es6.reflect.apply.js b/modules/es6.reflect.apply.js
@@ -1,9 +1,11 @@
 // 26.1.1 Reflect.apply(target, thisArgument, argumentsList)
-var $export = require('./_export')
-  , _apply  = Function.apply;
+var $export   = require('./_export')
+  , aFunction = require('./_a-function')
+  , anObject  = require('./_an-object')
+  , _apply    = Function.apply;
 
 $export($export.S, 'Reflect', {
   apply: function apply(target, thisArgument, argumentsList){
-    return _apply.call(target, thisArgument, argumentsList);
+    return _apply.call(aFunction(target), thisArgument, anObject(argumentsList));
   }
 });
diff --git a/tests/es.js b/tests/es.js
diff --git a/tests/library.js b/tests/library.js
diff --git a/tests/library/es6.reflect.apply.ls b/tests/library/es6.reflect.apply.ls
@@ -11,4 +11,6 @@ test 'Reflect.apply' (assert)!->
   C = (a, b, c)-> a + b + c
   C.apply = 42
   assert.strictEqual apply(C, null, <[foo bar baz]>), \foobarbaz, 'works with redefined apply'
-  assert.throws (!-> apply 42, null, []), TypeError, 'throws on primitive'
+  assert.throws (!-> apply 42, null, []), TypeError, 'throws on primitive'
+  assert.throws (!-> apply (!->), null), TypeError, 'throws without third argument'
+  assert.throws (!-> apply (!->), null, \123), TypeError, 'throws on primitive as third argument'
diff --git a/tests/tests.js b/tests/tests.js
diff --git a/tests/tests/es6.reflect.apply.ls b/tests/tests/es6.reflect.apply.ls
@@ -12,4 +12,6 @@ test 'Reflect.apply' (assert)!->
   C = (a, b, c)-> a + b + c
   C.apply = 42
   assert.strictEqual apply(C, null, <[foo bar baz]>), \foobarbaz, 'works with redefined apply'
-  assert.throws (!-> apply 42, null, []), TypeError, 'throws on primitive'
+  assert.throws (!-> apply 42, null, []), TypeError, 'throws on primitive as first argument'
+  assert.throws (!-> apply (!->), null), TypeError, 'throws without third argument'
+  assert.throws (!-> apply (!->), null, \123), TypeError, 'throws on primitive as third argument'