YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update detached arraybuffer handling (#4840)

Browse Source 
- Fix isValidIntegerIndex usage in IntegerIndexed objects, [[Get]], [[Set]], [[DefineOwnProperty]] internal methods.
- The test262 revision is updated to the latest master hash.
- The PR is not separated into individual PRs since the standard change couldn't be tested without the new test262 revision.

JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu
This commit is contained in:
Szilagyi Adam
2021-12-10 13:09:16 +01:00
committed by GitHub
parent d5f048e961
commit 4cbc77d709
10 changed files with 4862 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-arraybuffer-object.c
+32 -25
View File
@@ -130,14 +130,19 @@ ecma_arraybuffer_new_object (uint32_t length) /**< length of the arraybuffer */
* @return buffer pointer on success,
* NULL otherwise
*/
uint8_t *
ecma_value_t
ecma_arraybuffer_allocate_buffer (ecma_object_t *arraybuffer_p) /**< ArrayBuffer object */
{
JERRY_ASSERT (!(ECMA_ARRAYBUFFER_GET_FLAGS (arraybuffer_p) & ECMA_ARRAYBUFFER_ALLOCATED));
JERRY_ASSERT (!(ECMA_ARRAYBUFFER_GET_FLAGS (arraybuffer_p) & ECMA_ARRAYBUFFER_DETACHED));
JERRY_ASSERT (ECMA_ARRAYBUFFER_GET_FLAGS (arraybuffer_p) & ECMA_ARRAYBUFFER_HAS_POINTER);
ecma_extended_object_t *extended_object_p = (ecma_extended_object_t *) arraybuffer_p;
if (ECMA_ARRAYBUFFER_GET_FLAGS (arraybuffer_p) & ECMA_ARRAYBUFFER_DETACHED)
{
extended_object_p->u.cls.u1.array_buffer_flags |= ECMA_ARRAYBUFFER_ALLOCATED;
return ECMA_VALUE_UNDEFINED;
}
uint32_t arraybuffer_length = extended_object_p->u.cls.u3.length;
ecma_arraybuffer_pointer_t *arraybuffer_pointer_p = (ecma_arraybuffer_pointer_t *) arraybuffer_p;
jerry_arraybuffer_allocate_cb_t arraybuffer_allocate_callback = JERRY_CONTEXT (arraybuffer_allocate_callback);
@@ -166,15 +171,14 @@ ecma_arraybuffer_allocate_buffer (ecma_object_t *arraybuffer_p) /**< ArrayBuffer
if (buffer_p == NULL)
{
extended_object_p->u.cls.u1.array_buffer_flags |= ECMA_ARRAYBUFFER_DETACHED;
return NULL;
return ecma_raise_range_error (ECMA_ERR_ALLOCATE_ARRAY_BUFFER);
}
arraybuffer_pointer_p->buffer_p = buffer_p;
extended_object_p->u.cls.u1.array_buffer_flags |= ECMA_ARRAYBUFFER_ALLOCATED;
memset (buffer_p, 0, arraybuffer_length);
return buffer_p;
return ECMA_VALUE_UNDEFINED;
} /* ecma_arraybuffer_allocate_buffer */
/**
@@ -183,24 +187,12 @@ ecma_arraybuffer_allocate_buffer (ecma_object_t *arraybuffer_p) /**< ArrayBuffer
* @return ECMA_VALUE_UNDEFINED on success,
* ECMA_VALUE_ERROR otherwise
*/
ecma_value_t
extern inline ecma_value_t
ecma_arraybuffer_allocate_buffer_throw (ecma_object_t *arraybuffer_p)
{
JERRY_ASSERT (!(ECMA_ARRAYBUFFER_GET_FLAGS (arraybuffer_p) & ECMA_ARRAYBUFFER_ALLOCATED));
if (ECMA_ARRAYBUFFER_GET_FLAGS (arraybuffer_p) & ECMA_ARRAYBUFFER_DETACHED)
{
return ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
}
uint8_t *buffer_p = ecma_arraybuffer_allocate_buffer (arraybuffer_p);
if (buffer_p == NULL)
{
return ecma_raise_range_error (ECMA_ERR_ALLOCATE_ARRAY_BUFFER);
}
return ECMA_VALUE_UNDEFINED;
return ecma_arraybuffer_allocate_buffer (arraybuffer_p);
} /* ecma_arraybuffer_allocate_buffer_throw */
/**
@@ -214,6 +206,12 @@ ecma_arraybuffer_release_buffer (ecma_object_t *arraybuffer_p) /**< ArrayBuffer
jerry_arraybuffer_free_cb_t free_callback = JERRY_CONTEXT (arraybuffer_free_callback);
ecma_arraybuffer_pointer_t *arraybuffer_pointer_p = (ecma_arraybuffer_pointer_t *) arraybuffer_p;
if (arraybuffer_pointer_p->buffer_p == NULL)
{
return;
}
uint32_t arraybuffer_length = arraybuffer_pointer_p->extended_object.u.cls.u3.length;
if (free_callback == NULL)
@@ -345,8 +343,6 @@ ecma_arraybuffer_get_buffer (ecma_object_t *object_p) /**< pointer to the ArrayB
JERRY_ASSERT (ecma_object_class_is (object_p, ECMA_OBJECT_CLASS_ARRAY_BUFFER)
|| ecma_object_is_shared_arraybuffer (object_p));
JERRY_ASSERT (ECMA_ARRAYBUFFER_GET_FLAGS (object_p) & ECMA_ARRAYBUFFER_ALLOCATED);
if (!(ECMA_ARRAYBUFFER_GET_FLAGS (object_p) & ECMA_ARRAYBUFFER_HAS_POINTER))
{
return (uint8_t *) object_p + sizeof (ecma_extended_object_t);
@@ -423,11 +419,16 @@ ecma_builtin_arraybuffer_slice (ecma_value_t this_arg, const ecma_value_t *argum
ecma_object_t *object_p = ecma_get_object_from_value (this_arg);
/* 3-4. */
if (ECMA_ARRAYBUFFER_CHECK_BUFFER_ERROR (object_p))
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (object_p))
{
return ECMA_VALUE_ERROR;
}
if (ecma_arraybuffer_is_detached (object_p))
{
return ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
}
/* 5. */
uint32_t len = ecma_arraybuffer_get_length (object_p);
@@ -496,9 +497,15 @@ ecma_builtin_arraybuffer_slice (ecma_value_t this_arg, const ecma_value_t *argum
}
/* 14-15. */
if (ECMA_ARRAYBUFFER_CHECK_BUFFER_ERROR (new_arraybuffer_p))
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (new_arraybuffer_p))
{
ret_value = ecma_raise_type_error (ECMA_ERR_RETURNED_ARRAYBUFFER_HAS_BEEN_DETACHED);
ret_value = ECMA_VALUE_ERROR;
goto free_new_arraybuffer;
}
if (ecma_arraybuffer_is_detached (new_arraybuffer_p))
{
ret_value = ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
goto free_new_arraybuffer;
}
jerry-core/ecma/operations/ecma-arraybuffer-object.h
+2 -2
View File
@@ -36,7 +36,7 @@
/**
* Check whether the backing store is allocated for an array buffer.
*/
#define ECMA_ARRAYBUFFER_CHECK_BUFFER_ERROR(arraybuffer_p) \
#define ECMA_ARRAYBUFFER_LAZY_ALLOC(arraybuffer_p) \
(JERRY_UNLIKELY (!(ECMA_ARRAYBUFFER_GET_FLAGS (arraybuffer_p) & ECMA_ARRAYBUFFER_ALLOCATED)) \
&& ecma_arraybuffer_allocate_buffer_throw (arraybuffer_p) == ECMA_VALUE_ERROR)
@@ -48,7 +48,7 @@ ecma_value_t ecma_op_create_arraybuffer_object (const ecma_value_t *, uint32_t);
ecma_object_t *ecma_arraybuffer_create_object (uint8_t type, uint32_t length);
ecma_object_t *ecma_arraybuffer_create_object_with_buffer (uint8_t type, uint32_t length);
ecma_object_t *ecma_arraybuffer_new_object (uint32_t length);
uint8_t *ecma_arraybuffer_allocate_buffer (ecma_object_t *arraybuffer_p);
ecma_value_t ecma_arraybuffer_allocate_buffer (ecma_object_t *arraybuffer_p);
ecma_value_t ecma_arraybuffer_allocate_buffer_throw (ecma_object_t *arraybuffer_p);
void ecma_arraybuffer_release_buffer (ecma_object_t *arraybuffer_p);
uint8_t *JERRY_ATTR_PURE ecma_arraybuffer_get_buffer (ecma_object_t *obj_p);
jerry-core/ecma/operations/ecma-dataview-object.c
+16 -2
View File
@@ -299,11 +299,18 @@ ecma_op_dataview_get_set_view_value (ecma_value_t view, /**< the operation's 'vi
/* GetViewValue 4., SetViewValue 6. */
bool is_little_endian = ecma_op_to_boolean (is_little_endian_value);
if (ECMA_ARRAYBUFFER_CHECK_BUFFER_ERROR (buffer_p))
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (buffer_p))
{
ecma_free_value (value_to_set);
return ECMA_VALUE_ERROR;
}
if (ecma_arraybuffer_is_detached (buffer_p))
{
ecma_free_value (value_to_set);
return ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
}
/* GetViewValue 7., SetViewValue 9. */
uint32_t view_offset = view_p->byte_offset;
@@ -320,11 +327,18 @@ ecma_op_dataview_get_set_view_value (ecma_value_t view, /**< the operation's 'vi
return ecma_raise_range_error (ECMA_ERR_START_OFFSET_IS_OUTSIDE_THE_BOUNDS_OF_THE_BUFFER);
}
if (ECMA_ARRAYBUFFER_CHECK_BUFFER_ERROR (buffer_p))
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (buffer_p))
{
ecma_free_value (value_to_set);
return ECMA_VALUE_ERROR;
}
if (ecma_arraybuffer_is_detached (buffer_p))
{
ecma_free_value (value_to_set);
return ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
}
/* GetViewValue 11., SetViewValue 13. */
bool system_is_little_endian = ecma_dataview_check_little_endian ();
jerry-core/ecma/operations/ecma-typedarray-object.c
+194 -129
View File
@@ -633,18 +633,18 @@ extern inline ecma_value_t JERRY_ATTR_ALWAYS_INLINE
ecma_get_typedarray_element (ecma_typedarray_info_t *info_p, /**< typedarray info */
uint32_t index) /**< element index */
{
uint8_t *buffer_p = ecma_typedarray_get_buffer (info_p);
if (JERRY_UNLIKELY (buffer_p == NULL))
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (info_p->array_buffer_p))
{
return ECMA_VALUE_ERROR;
}
if (index >= info_p->length)
if (ecma_arraybuffer_is_detached (info_p->array_buffer_p) || index >= info_p->length)
{
return ECMA_VALUE_UNDEFINED;
}
uint8_t *buffer_p = ecma_typedarray_get_buffer (info_p);
return ecma_typedarray_getters[info_p->id](buffer_p + (index << info_p->shift));
} /* ecma_get_typedarray_element */
@@ -688,20 +688,20 @@ ecma_set_typedarray_element (ecma_typedarray_info_t *info_p, /**< typedarray inf
}
}
uint8_t *buffer_p = ecma_typedarray_get_buffer (info_p);
if (JERRY_UNLIKELY (buffer_p == NULL))
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (info_p->array_buffer_p))
{
ecma_free_value (to_num);
return ECMA_VALUE_ERROR;
}
if (index >= info_p->length)
if (ecma_arraybuffer_is_detached (info_p->array_buffer_p) || index >= info_p->length)
{
ecma_free_value (to_num);
return ECMA_VALUE_FALSE;
}
uint8_t *buffer_p = ecma_typedarray_get_buffer (info_p);
ecma_free_value (to_num);
return ecma_typedarray_setters[info_p->id](buffer_p + (index << info_p->shift), value);
@@ -886,11 +886,16 @@ ecma_typedarray_create_object_with_typedarray (ecma_object_t *typedarray_p, /**<
uint32_t array_length = ecma_typedarray_get_length (typedarray_p);
ecma_object_t *src_arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
if (ECMA_ARRAYBUFFER_CHECK_BUFFER_ERROR (src_arraybuffer_p))
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (src_arraybuffer_p))
{
return ECMA_VALUE_ERROR;
}
if (ecma_arraybuffer_is_detached (src_arraybuffer_p))
{
return ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
}
ecma_value_t new_typedarray = ecma_typedarray_create_object_with_length (array_length,
src_arraybuffer_p,
proto_p,
@@ -905,11 +910,18 @@ ecma_typedarray_create_object_with_typedarray (ecma_object_t *typedarray_p, /**<
ecma_object_t *new_typedarray_p = ecma_get_object_from_value (new_typedarray);
ecma_object_t *dst_arraybuffer_p = ecma_typedarray_get_arraybuffer (new_typedarray_p);
if (ECMA_ARRAYBUFFER_CHECK_BUFFER_ERROR (dst_arraybuffer_p))
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (dst_arraybuffer_p))
{
ecma_deref_object (new_typedarray_p);
return ECMA_VALUE_ERROR;
}
if (ecma_arraybuffer_is_detached (dst_arraybuffer_p))
{
ecma_deref_object (new_typedarray_p);
return ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
}
lit_utf8_byte_t *src_buf_p = ecma_arraybuffer_get_buffer (src_arraybuffer_p);
lit_utf8_byte_t *dst_buf_p = ecma_arraybuffer_get_buffer (dst_arraybuffer_p);
@@ -1094,34 +1106,44 @@ ecma_typedarray_create_object_with_object (ecma_value_t items_val, /**< the sour
ecma_object_t *new_typedarray_p = ecma_get_object_from_value (new_typedarray);
ecma_typedarray_info_t info = ecma_typedarray_get_info (new_typedarray_p);
ecma_value_t *next_value_p = values_p->buffer_p;
uint8_t *buffer_p = ecma_typedarray_get_buffer (&info);
ret_value = ECMA_VALUE_ERROR;
if (buffer_p != NULL)
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (info.array_buffer_p))
{
ecma_typedarray_setter_fn_t setter_cb = ecma_get_typedarray_setter_fn (info.id);
uint8_t *limit_p = buffer_p + (values_p->item_count << info.shift);
ret_value = ecma_make_object_value (new_typedarray_p);
/* 8.e */
while (buffer_p < limit_p)
{
ecma_value_t value = *next_value_p++;
ecma_value_t set_value = setter_cb (buffer_p, value);
ecma_free_value (value);
if (ECMA_IS_VALUE_ERROR (set_value))
{
ret_value = set_value;
break;
}
buffer_p += info.element_size;
}
goto free_collection;
}
if (ecma_arraybuffer_is_detached (info.array_buffer_p))
{
ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
goto free_collection;
}
uint8_t *buffer_p = ecma_typedarray_get_buffer (&info);
ecma_typedarray_setter_fn_t setter_cb = ecma_get_typedarray_setter_fn (info.id);
uint8_t *limit_p = buffer_p + (values_p->item_count << info.shift);
ret_value = ecma_make_object_value (new_typedarray_p);
/* 8.e */
while (buffer_p < limit_p)
{
ecma_value_t value = *next_value_p++;
ecma_value_t set_value = setter_cb (buffer_p, value);
ecma_free_value (value);
if (ECMA_IS_VALUE_ERROR (set_value))
{
ret_value = set_value;
break;
}
buffer_p += info.element_size;
}
free_collection:
if (ECMA_IS_VALUE_ERROR (ret_value))
{
ecma_value_t *last_value_p = values_p->buffer_p + values_p->item_count;
@@ -1178,44 +1200,55 @@ ecma_typedarray_create_object_with_object (ecma_value_t items_val, /**< the sour
ecma_object_t *new_typedarray_p = ecma_get_object_from_value (new_typedarray);
ecma_typedarray_info_t info = ecma_typedarray_get_info (new_typedarray_p);
uint8_t *buffer_p = ecma_typedarray_get_buffer (&info);
ecma_value_t ret_value = ECMA_VALUE_ERROR;
if (buffer_p != NULL)
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (info.array_buffer_p))
{
ecma_typedarray_setter_fn_t setter_cb = ecma_get_typedarray_setter_fn (info.id);
ret_value = ecma_make_object_value (new_typedarray_p);
/* 12 */
for (uint32_t index = 0; index < len; index++)
{
ecma_value_t value = ecma_op_object_find_by_index (arraylike_object_p, index);
if (ECMA_IS_VALUE_ERROR (value))
{
ret_value = value;
break;
}
if (!ecma_is_value_found (value))
{
value = ECMA_VALUE_UNDEFINED;
}
ecma_value_t set_value = setter_cb (buffer_p, value);
ecma_free_value (value);
if (ECMA_IS_VALUE_ERROR (set_value))
{
ret_value = set_value;
break;
}
buffer_p += info.element_size;
}
goto free_object;
}
if (ecma_arraybuffer_is_detached (info.array_buffer_p))
{
ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
goto free_object;
}
uint8_t *buffer_p = ecma_typedarray_get_buffer (&info);
ecma_typedarray_setter_fn_t setter_cb = ecma_get_typedarray_setter_fn (info.id);
ret_value = ecma_make_object_value (new_typedarray_p);
/* 12 */
for (uint32_t index = 0; index < len; index++)
{
ecma_value_t value = ecma_op_object_find_by_index (arraylike_object_p, index);
if (ECMA_IS_VALUE_ERROR (value))
{
ret_value = value;
break;
}
if (!ecma_is_value_found (value))
{
value = ECMA_VALUE_UNDEFINED;
}
ecma_value_t set_value = setter_cb (buffer_p, value);
ecma_free_value (value);
if (ECMA_IS_VALUE_ERROR (set_value))
{
ret_value = set_value;
break;
}
buffer_p += info.element_size;
}
free_object:
ecma_deref_object (arraylike_object_p);
if (ECMA_IS_VALUE_ERROR (ret_value))
@@ -1331,30 +1364,40 @@ ecma_op_typedarray_from (ecma_value_t this_val, /**< this value */
ecma_typedarray_info_t info = ecma_typedarray_get_info (new_typedarray_p);
ecma_typedarray_setter_fn_t setter_cb = ecma_get_typedarray_setter_fn (info.id);
ecma_value_t *next_value_p = values_p->buffer_p;
uint8_t *buffer_p = ecma_typedarray_get_buffer (&info);
ret_value = ECMA_VALUE_ERROR;
if (buffer_p != NULL)
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (info.array_buffer_p))
{
ret_value = ecma_make_object_value (new_typedarray_p);
/* 6.e */
for (uint32_t index = 0; index < values_p->item_count; index++)
{
ecma_value_t set_value =
ecma_op_typedarray_from_helper (this_arg, *next_value_p++, index, func_object_p, buffer_p, setter_cb);
if (ECMA_IS_VALUE_ERROR (set_value))
{
ret_value = set_value;
break;
}
buffer_p += info.element_size;
}
goto free_collection;
}
if (ecma_arraybuffer_is_detached (info.array_buffer_p))
{
ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
goto free_collection;
}
uint8_t *buffer_p = ecma_typedarray_get_buffer (&info);
ret_value = ecma_make_object_value (new_typedarray_p);
/* 6.e */
for (uint32_t index = 0; index < values_p->item_count; index++)
{
ecma_value_t set_value =
ecma_op_typedarray_from_helper (this_arg, *next_value_p++, index, func_object_p, buffer_p, setter_cb);
if (ECMA_IS_VALUE_ERROR (set_value))
{
ret_value = set_value;
break;
}
buffer_p += info.element_size;
}
free_collection:
if (ECMA_IS_VALUE_ERROR (ret_value))
{
ecma_value_t *last_value_p = values_p->buffer_p + values_p->item_count;
@@ -1413,44 +1456,55 @@ ecma_op_typedarray_from (ecma_value_t this_val, /**< this value */
ecma_object_t *new_typedarray_p = ecma_get_object_from_value (new_typedarray);
ecma_typedarray_info_t info = ecma_typedarray_get_info (new_typedarray_p);
uint8_t *buffer_p = ecma_typedarray_get_buffer (&info);
ecma_value_t ret_value = ECMA_VALUE_ERROR;
if (buffer_p != NULL)
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (info.array_buffer_p))
{
ecma_typedarray_setter_fn_t setter_cb = ecma_get_typedarray_setter_fn (info.id);
ret_value = ecma_make_object_value (new_typedarray_p);
/* 12 */
for (uint32_t index = 0; index < len; index++)
{
ecma_value_t value = ecma_op_object_find_by_index (arraylike_object_p, index);
if (ECMA_IS_VALUE_ERROR (value))
{
ret_value = value;
break;
}
if (!ecma_is_value_found (value))
{
value = ECMA_VALUE_UNDEFINED;
}
ecma_value_t set_value =
ecma_op_typedarray_from_helper (this_arg, value, index, func_object_p, buffer_p, setter_cb);
if (ECMA_IS_VALUE_ERROR (set_value))
{
ret_value = set_value;
break;
}
buffer_p += info.element_size;
}
goto free_object;
}
if (ecma_arraybuffer_is_detached (info.array_buffer_p))
{
ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
goto free_object;
}
uint8_t *buffer_p = ecma_typedarray_get_buffer (&info);
ecma_typedarray_setter_fn_t setter_cb = ecma_get_typedarray_setter_fn (info.id);
ret_value = ecma_make_object_value (new_typedarray_p);
/* 12 */
for (uint32_t index = 0; index < len; index++)
{
ecma_value_t value = ecma_op_object_find_by_index (arraylike_object_p, index);
if (ECMA_IS_VALUE_ERROR (value))
{
ret_value = value;
break;
}
if (!ecma_is_value_found (value))
{
value = ECMA_VALUE_UNDEFINED;
}
ecma_value_t set_value =
ecma_op_typedarray_from_helper (this_arg, value, index, func_object_p, buffer_p, setter_cb);
if (ECMA_IS_VALUE_ERROR (set_value))
{
ret_value = set_value;
break;
}
buffer_p += info.element_size;
}
free_object:
ecma_deref_object (arraylike_object_p);
if (ECMA_IS_VALUE_ERROR (ret_value))
@@ -1558,17 +1612,10 @@ ecma_typedarray_get_offset (ecma_object_t *typedarray_p) /**< the pointer to the
* @return pointer to the data buffer if successfull,
* NULL otherwise
*/
uint8_t *
extern inline uint8_t *
ecma_typedarray_get_buffer (ecma_typedarray_info_t *info_p) /**< typedarray info */
{
ecma_object_t *array_buffer_p = info_p->array_buffer_p;
if (ECMA_ARRAYBUFFER_CHECK_BUFFER_ERROR (array_buffer_p))
{
return NULL;
}
return ecma_arraybuffer_get_buffer (array_buffer_p) + info_p->offset;
return ecma_arraybuffer_get_buffer (info_p->array_buffer_p) + info_p->offset;
} /* ecma_typedarray_get_buffer */
/**
@@ -1756,6 +1803,20 @@ ecma_typedarray_iterators_helper (ecma_value_t this_arg, /**< this argument */
ecma_iterator_kind_t kind) /**< iterator kind */
{
JERRY_ASSERT (ecma_is_typedarray (this_arg));
ecma_object_t *typedarray_p = ecma_get_object_from_value (this_arg);
ecma_typedarray_info_t info = ecma_typedarray_get_info (typedarray_p);
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (info.array_buffer_p))
{
return ECMA_VALUE_ERROR;
}
if (ecma_arraybuffer_is_detached (info.array_buffer_p))
{
return ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
}
ecma_object_t *prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_ARRAY_ITERATOR_PROTOTYPE);
return ecma_op_create_iterator_object (this_arg, prototype_obj_p, ECMA_OBJECT_CLASS_ARRAY_ITERATOR, kind);
@@ -1882,7 +1943,7 @@ ecma_op_typedarray_define_own_property (ecma_object_t *obj_p, /**< TypedArray ob
ecma_typedarray_info_t info = ecma_typedarray_get_info (obj_p);
if (index == ECMA_STRING_NOT_ARRAY_INDEX || index >= info.length)
if (index >= info.length || ecma_arraybuffer_is_detached (info.array_buffer_p))
{
return ECMA_VALUE_FALSE;
}
@@ -1931,10 +1992,15 @@ ecma_typedarray_create (ecma_object_t *constructor_p, /**< constructor function
}
ecma_object_t *typedarray_p = ecma_get_object_from_value (ret_val);
ecma_typedarray_info_t info = ecma_typedarray_get_info (typedarray_p);
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (ecma_get_object_from_value (ret_val));
if (ECMA_ARRAYBUFFER_LAZY_ALLOC (info.array_buffer_p))
{
ecma_deref_object (typedarray_p);
return ECMA_VALUE_ERROR;
}
if (ecma_arraybuffer_is_detached (arraybuffer_p))
if (ecma_arraybuffer_is_detached (info.array_buffer_p))
{
ecma_deref_object (typedarray_p);
return ecma_raise_type_error (ECMA_ERR_ARRAYBUFFER_IS_DETACHED);
@@ -1943,7 +2009,6 @@ ecma_typedarray_create (ecma_object_t *constructor_p, /**< constructor function
if ((arguments_list_len == 1) && (ecma_is_value_number (arguments_list_p[0])))
{
ecma_number_t num = ecma_get_number_from_value (arguments_list_p[0]);
ecma_typedarray_info_t info = ecma_typedarray_get_info (typedarray_p);
if (info.length < num)
{