archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Correctly convert data in case of TypedArray slice (#4796)

Browse Source 
When executin the TypedArray's slice method it is possible to have
the a different element sized output TypedArray. In such case
the data must be converted to the desired element type/size.

JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.usz@partner.samsung.com
This commit is contained in:
Péter Gál 2021-10-20 15:40:33 +02:00 committed by GitHub
parent 4912e3b739
commit dae234f416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c
View File

@ -1589,28 +1589,55 @@ ecma_builtin_typedarray_prototype_slice (ecma_value_t this_arg, /**< this argume
ecma_value_t new_typedarray = ecma_typedarray_species_create (this_arg, &len, 1);
ecma_free_value (len);
if (ECMA_IS_VALUE_ERROR (new_typedarray))
if (ECMA_IS_VALUE_ERROR (new_typedarray) || count == 0)
{
return new_typedarray;
}
if (count > 0)
ecma_object_t *new_typedarray_p = ecma_get_object_from_value (new_typedarray);
if (ecma_arraybuffer_is_detached (info_p->array_buffer_p))
{
ecma_object_t *new_typedarray_p = ecma_get_object_from_value (new_typedarray);
ecma_deref_object (new_typedarray_p);
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
if (ecma_arraybuffer_is_detached (info_p->array_buffer_p))
{
ecma_deref_object (new_typedarray_p);
return ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_arraybuffer_is_detached));
}
ecma_typedarray_info_t new_typedarray_info = ecma_typedarray_get_info (new_typedarray_p);
lit_utf8_byte_t *new_typedarray_buffer_p = ecma_typedarray_get_buffer (new_typedarray_p);
if (info_p->id == new_typedarray_info.id)
{
// 22.2.3.23. Step 22. h-i.
uint32_t src_byte_index = (relative_start * info_p->element_size);
memcpy (new_typedarray_buffer_p,
memcpy (new_typedarray_info.buffer_p,
info_p->buffer_p + src_byte_index,
count * info_p->element_size);
}
else
{
// 22.2.3.23. Step 21. b.
ecma_typedarray_getter_fn_t src_typedarray_getter_cb = ecma_get_typedarray_getter_fn (info_p->id);
ecma_typedarray_setter_fn_t new_typedarray_setter_cb = ecma_get_typedarray_setter_fn (new_typedarray_info.id);
uint32_t src_byte_index = (relative_start * info_p->element_size);
uint32_t dst_byte_index = 0;
for (uint32_t idx = 0; idx < count; idx++)
{
ecma_value_t element = src_typedarray_getter_cb (info_p->buffer_p + src_byte_index);
ecma_value_t set_element = new_typedarray_setter_cb (new_typedarray_info.buffer_p + dst_byte_index, element);
ecma_free_value (element);
if (ECMA_IS_VALUE_ERROR (set_element))
{
ecma_deref_object (new_typedarray_p);
return set_element;
}
src_byte_index += info_p->element_size;
dst_byte_index += new_typedarray_info.element_size;
}
}
return new_typedarray;
} /* ecma_builtin_typedarray_prototype_slice */

1
tests/test262-esnext-excludelist.xml
View File

@ -52,7 +52,6 @@
<test id="built-ins/String/prototype/toLocaleLowerCase/special_casing_conditional.js"><reason></reason></test>
<test id="built-ins/String/prototype/toLowerCase/Final_Sigma_U180E.js"><reason></reason></test>
<test id="built-ins/String/prototype/toLowerCase/special_casing_conditional.js"><reason></reason></test>
<test id="built-ins/TypedArray/prototype/slice/set-values-from-different-ctor-type.js"><reason></reason></test>
<test id="language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js"><reason></reason></test>
<test id="language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js"><reason></reason></test>
<test id="language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js"><reason></reason></test>