Limit maximum number of arguments for apply(). (#2183)
The length*sizeof(ecma_value_t) may overflow on 32 bit systems which cause a memory corruption when the values are filled. Fixes #2182. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
committed by
Dániel Bátyai
parent
06ebfc52ed
commit
36051ec92b
@@ -43,6 +43,11 @@
|
|||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maximum number of arguments for an apply function.
|
||||||
|
*/
|
||||||
|
#define ECMA_FUNCTION_APPLY_ARGUMENT_COUNT_LIMIT 65535
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Function.prototype object's 'toString' routine
|
* The Function.prototype object's 'toString' routine
|
||||||
*
|
*
|
||||||
@@ -122,6 +127,12 @@ ecma_builtin_function_prototype_object_apply (ecma_value_t this_arg, /**< this a
|
|||||||
/* 5. */
|
/* 5. */
|
||||||
const uint32_t length = ecma_number_to_uint32 (length_number);
|
const uint32_t length = ecma_number_to_uint32 (length_number);
|
||||||
|
|
||||||
|
if (length >= ECMA_FUNCTION_APPLY_ARGUMENT_COUNT_LIMIT)
|
||||||
|
{
|
||||||
|
ret_value = ecma_raise_range_error (ECMA_ERR_MSG ("Too many arguments declared for Function.apply()."));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
/* 6. */
|
/* 6. */
|
||||||
JMEM_DEFINE_LOCAL_ARRAY (arguments_list_p, length, ecma_value_t);
|
JMEM_DEFINE_LOCAL_ARRAY (arguments_list_p, length, ecma_value_t);
|
||||||
uint32_t last_index = 0;
|
uint32_t last_index = 0;
|
||||||
@@ -159,6 +170,7 @@ ecma_builtin_function_prototype_object_apply (ecma_value_t this_arg, /**< this a
|
|||||||
}
|
}
|
||||||
|
|
||||||
JMEM_FINALIZE_LOCAL_ARRAY (arguments_list_p);
|
JMEM_FINALIZE_LOCAL_ARRAY (arguments_list_p);
|
||||||
|
}
|
||||||
|
|
||||||
ECMA_OP_TO_NUMBER_FINALIZE (length_number);
|
ECMA_OP_TO_NUMBER_FINALIZE (length_number);
|
||||||
ECMA_FINALIZE (length_value);
|
ECMA_FINALIZE (length_value);
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
// Copyright JS Foundation and other contributors, http://js.foundation
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
function test(len)
|
||||||
|
{
|
||||||
|
function applyTest() { }
|
||||||
|
try {
|
||||||
|
applyTest.apply(null, { length : len });
|
||||||
|
assert(false);
|
||||||
|
} catch (e) {
|
||||||
|
assert(e instanceof RangeError);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
test(65536);
|
||||||
|
test(0x40000001);
|
||||||
|
test(0xffffffff);
|
||||||
Reference in New Issue
Block a user