Skip to content

Fix new ArrayBuffer(length) for various input #1959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions jerry-core/ecma/operations/ecma-arraybuffer-object.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,14 @@ ecma_op_create_arraybuffer_object (const ecma_value_t *arguments_list_p, /**< li
{
JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL);

uint32_t length = 0;
ecma_number_t length_num = 0;

if (arguments_list_len > 0)
{
ecma_number_t num;

if (ecma_is_value_number (arguments_list_p[0]))
{
num = ecma_get_number_from_value (arguments_list_p[0]);
length_num = ecma_get_number_from_value (arguments_list_p[0]);
}
else
{
Expand All @@ -94,21 +93,27 @@ ecma_op_create_arraybuffer_object (const ecma_value_t *arguments_list_p, /**< li
return to_number_value;
}

num = ecma_get_number_from_value (to_number_value);
length_num = ecma_get_number_from_value (to_number_value);

ecma_free_value (to_number_value);
}

length = ecma_number_to_uint32 (num);
if (ecma_number_is_nan (length_num))
{
length_num = 0;
}

if (num != ((ecma_number_t) length)
|| length > (UINT32_MAX - sizeof (ecma_extended_object_t) - JMEM_ALIGNMENT + 1))
const uint32_t maximum_size_in_byte = UINT32_MAX - sizeof (ecma_extended_object_t) - JMEM_ALIGNMENT + 1;

if (length_num <= -1.0 || length_num > (double) maximum_size_in_byte + 0.5)
{
return ecma_raise_range_error (ECMA_ERR_MSG ("Invalid ArrayBuffer length."));
}
}

return ecma_make_object_value (ecma_arraybuffer_new_object (length));
uint32_t length_uint32 = ecma_number_to_uint32 (length_num);

return ecma_make_object_value (ecma_arraybuffer_new_object (length_uint32));
} /* ecma_op_create_arraybuffer_object */

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@

var a = new ArrayBuffer();
assert(typeof a === 'object');
assert(a.byteLength === 0);
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@

var a = new ArrayBuffer(5);
assert(typeof a === 'object');
assert(a.byteLength === 5);
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@

var a = new ArrayBuffer("5");
assert(typeof a === 'object');
assert(a.byteLength === 5);
14 changes: 2 additions & 12 deletions tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-006.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,5 @@
* limitations under the License.
*/

var name = "";

try
{
var a = new ArrayBuffer(5.5);
}
catch (e)
{
name = e.name;
}

assert(name === "RangeError");
var a = new ArrayBuffer(5.5);
assert(a.byteLength === 5);
14 changes: 2 additions & 12 deletions tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-007.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,5 @@
* limitations under the License.
*/

var name = "";

try
{
var a = new ArrayBuffer("string");
}
catch (e)
{
name = e.name;
}

assert(name === "RangeError");
var a = new ArrayBuffer("string");
assert(a.byteLength === 0);
13 changes: 2 additions & 11 deletions tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-008.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,6 @@
* limitations under the License.
*/

var name = "";
var obj = {};
try
{
var a = new ArrayBuffer(obj);
}
catch (e)
{
name = e.name;
}

assert(name === "RangeError");
var a = new ArrayBuffer(obj);
assert(a.byteLength === 0);
17 changes: 17 additions & 0 deletions tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-009.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* 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.
*/

var a = new ArrayBuffer(undefined);
assert(a.byteLength === 0);
17 changes: 17 additions & 0 deletions tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-010.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* 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.
*/

var a = new ArrayBuffer(NaN);
assert(a.byteLength === 0);
20 changes: 20 additions & 0 deletions tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-011.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* 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.
*/

var a = new ArrayBuffer(-0.3);
assert(a.byteLength === 0);

var b = new ArrayBuffer(-0.9);
assert(b.byteLength === 0);
26 changes: 26 additions & 0 deletions tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-012.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* 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.
*/

var name = "";
try
{
var a = new ArrayBuffer(-1.9);
}
catch (e)
{
name = e.name;
}

assert(name === "RangeError");
26 changes: 26 additions & 0 deletions tests/jerry-test-suite/es2015/24/24.01/24.01.02/24.01.02-013.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* 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.
*/

var name = "";
try
{
var a = new ArrayBuffer(Math.pow(2, 32) - 1);
}
catch (e)
{
name = e.name;
}

assert(name === "RangeError");