Skip to content

Commit 5984f7d

Browse files
legendecaslegendecas
committed
Assertions on if the arraybuffer has been detached
JerryScript-DCO-1.0-Signed-off-by: legendecas legendecas@gmail.com
1 parent 923bc54 commit 5984f7d

7 files changed

+141
-2
lines changed

‎jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c

+9
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ ecma_builtin_arraybuffer_prototype_bytelength_getter (ecma_value_t this_arg) /**
6161

6262
if (ecma_object_class_is (object_p, LIT_MAGIC_STRING_ARRAY_BUFFER_UL))
6363
{
64+
if (ecma_arraybuffer_is_detached (object_p))
65+
{
66+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
67+
}
6468
ecma_length_t len = ecma_arraybuffer_get_length (object_p);
6569

6670
return ecma_make_uint32_value (len);
@@ -96,6 +100,11 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi
96100
return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not an ArrayBuffer object."));
97101
}
98102

103+
if (ecma_arraybuffer_is_detached (object_p))
104+
{
105+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
106+
}
107+
99108
ecma_length_t len = ecma_arraybuffer_get_length (object_p);
100109

101110
ecma_length_t start = 0, end = len;

‎jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c

+11
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* limitations under the License.
1414
*/
1515

16+
#include "ecma-arraybuffer-object.h"
17+
#include "ecma-exceptions.h"
1618
#include "ecma-dataview-object.h"
1719
#include "ecma-gc.h"
1820

@@ -110,11 +112,20 @@ ecma_builtin_dataview_prototype_object_getters (ecma_value_t this_arg, /**< this
110112
}
111113
case ECMA_DATAVIEW_PROTOTYPE_BYTE_LENGTH_GETTER:
112114
{
115+
if (ecma_arraybuffer_is_detached (obj_p->buffer_p))
116+
{
117+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
118+
}
113119
return ecma_make_uint32_value (obj_p->header.u.class_prop.u.length);
114120
}
115121
default:
116122
{
117123
JERRY_ASSERT (builtin_routine_id == ECMA_DATAVIEW_PROTOTYPE_BYTE_OFFSET_GETTER);
124+
125+
if (ecma_arraybuffer_is_detached (obj_p->buffer_p))
126+
{
127+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
128+
}
118129
return ecma_make_uint32_value (obj_p->byte_offset);
119130
}
120131
}

‎jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c

+63
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ ecma_builtin_typedarray_prototype_exec_routine (ecma_value_t this_arg, /**< this
206206

207207
ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);
208208
ecma_typedarray_info_t info = ecma_typedarray_get_info (obj_p);
209+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (obj_p);
210+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
211+
{
212+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
213+
}
209214

210215
ecma_typedarray_getter_fn_t typedarray_getter_cb = ecma_get_typedarray_getter_fn (info.id);
211216

@@ -435,6 +440,12 @@ ecma_builtin_typedarray_prototype_map (ecma_value_t this_arg, /**< this argument
435440
}
436441

437442
ecma_object_t *src_obj_p = ecma_get_object_from_value (this_arg);
443+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (src_obj_p);
444+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
445+
{
446+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
447+
}
448+
438449
ecma_typedarray_info_t src_info = ecma_typedarray_get_info (src_obj_p);
439450

440451
ecma_object_t *func_object_p = ecma_get_object_from_value (cb_func_val);
@@ -517,6 +528,12 @@ ecma_builtin_typedarray_prototype_reduce_with_direction (ecma_value_t this_arg,
517528
}
518529

519530
ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);
531+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (obj_p);
532+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
533+
{
534+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
535+
}
536+
520537
ecma_typedarray_info_t info = ecma_typedarray_get_info (obj_p);
521538

522539
ecma_typedarray_getter_fn_t getter_cb = ecma_get_typedarray_getter_fn (info.id);
@@ -770,6 +787,12 @@ ecma_builtin_typedarray_prototype_reverse (ecma_value_t this_arg) /**< this argu
770787
}
771788

772789
ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);
790+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (obj_p);
791+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
792+
{
793+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
794+
}
795+
773796
ecma_typedarray_info_t info = ecma_typedarray_get_info (obj_p);
774797

775798
uint32_t middle = (info.length / 2) << info.shift;
@@ -822,9 +845,21 @@ ecma_op_typedarray_set_with_typedarray (ecma_value_t this_arg, /**< this argumen
822845
}
823846

824847
ecma_object_t *target_typedarray_p = ecma_get_object_from_value (this_arg);
848+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (target_typedarray_p);
849+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
850+
{
851+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
852+
}
853+
825854
ecma_typedarray_info_t target_info = ecma_typedarray_get_info (target_typedarray_p);
826855

827856
ecma_object_t *src_typedarray_p = ecma_get_object_from_value (arr_val);
857+
ecma_object_t *src_arraybuffer_p = ecma_typedarray_get_arraybuffer (src_typedarray_p);
858+
if (ecma_arraybuffer_is_detached (src_arraybuffer_p))
859+
{
860+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
861+
}
862+
828863
ecma_typedarray_info_t src_info = ecma_typedarray_get_info (src_typedarray_p);
829864

830865
uint32_t target_offset_uint32 = ecma_number_to_uint32 (target_offset_num);
@@ -911,6 +946,12 @@ ecma_builtin_typedarray_prototype_set (ecma_value_t this_arg, /**< this argument
911946

912947
/* 11. ~ 15. */
913948
ecma_object_t *typedarray_p = ecma_get_object_from_value (this_arg);
949+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
950+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
951+
{
952+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
953+
}
954+
914955
ecma_typedarray_info_t target_info = ecma_typedarray_get_info (typedarray_p);
915956

916957
/* 16.~ 17. */
@@ -1476,6 +1517,11 @@ ecma_builtin_typedarray_prototype_sort (ecma_value_t this_arg, /**< this argumen
14761517
}
14771518

14781519
ecma_object_t *typedarray_p = ecma_get_object_from_value (this_arg);
1520+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
1521+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
1522+
{
1523+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
1524+
}
14791525
ecma_typedarray_info_t info = ecma_typedarray_get_info (typedarray_p);
14801526

14811527
if (!info.length)
@@ -1577,6 +1623,11 @@ ecma_builtin_typedarray_prototype_find_helper (ecma_value_t this_arg, /**< this
15771623

15781624
ecma_object_t *typedarray_p = ecma_get_object_from_value (this_arg);
15791625
ecma_typedarray_info_t info = ecma_typedarray_get_info (typedarray_p);
1626+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
1627+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
1628+
{
1629+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
1630+
}
15801631

15811632
uint32_t buffer_index = 0;
15821633
uint32_t limit = info.length * info.element_size;
@@ -1678,6 +1729,11 @@ ecma_builtin_typedarray_prototype_index_helper (ecma_value_t this_arg, /**< this
16781729

16791730
ecma_object_t *typedarray_p = ecma_get_object_from_value (this_arg);
16801731
ecma_typedarray_info_t info = ecma_typedarray_get_info (typedarray_p);
1732+
if (ecma_arraybuffer_is_detached (info.array_buffer_p))
1733+
{
1734+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
1735+
}
1736+
16811737
uint32_t limit = info.length * info.element_size;
16821738
uint32_t from_index;
16831739

@@ -1901,6 +1957,12 @@ ecma_builtin_typedarray_prototype_slice (ecma_value_t this_arg, /**< this argume
19011957
}
19021958

19031959
ecma_object_t *typedarray_p = ecma_get_object_from_value (this_arg);
1960+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
1961+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
1962+
{
1963+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
1964+
}
1965+
19041966
ecma_typedarray_info_t info = ecma_typedarray_get_info (typedarray_p);
19051967
uint32_t start = 0;
19061968
uint32_t end = info.length;
@@ -1944,6 +2006,7 @@ ecma_builtin_typedarray_prototype_slice (ecma_value_t this_arg, /**< this argume
19442006
if (count > 0)
19452007
{
19462008
ecma_object_t *new_typedarray_p = ecma_get_object_from_value (new_typedarray);
2009+
19472010
lit_utf8_byte_t *new_typedarray_buffer_p = ecma_typedarray_get_buffer (new_typedarray_p);
19482011
uint32_t src_byte_index = (start * info.element_size);
19492012

‎jerry-core/ecma/operations/ecma-arraybuffer-object.c

+26
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,32 @@ ecma_arraybuffer_get_buffer (ecma_object_t *object_p) /**< pointer to the ArrayB
203203
}
204204
} /* ecma_arraybuffer_get_buffer */
205205

206+
/**
207+
* Helper function: check if the target ArrayBuffer is detached
208+
*
209+
*
210+
* @return true - if value is an detached ArrayBuffer object
211+
* false - otherwise
212+
*/
213+
inline bool JERRY_ATTR_PURE JERRY_ATTR_ALWAYS_INLINE
214+
ecma_arraybuffer_is_detached (ecma_object_t *object_p) /**< pointer to the ArrayBuffer object */
215+
{
216+
JERRY_ASSERT (ecma_object_class_is (object_p, LIT_MAGIC_STRING_ARRAY_BUFFER_UL));
217+
218+
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
219+
220+
if (ECMA_ARRAYBUFFER_HAS_EXTERNAL_MEMORY (ext_object_p))
221+
{
222+
ecma_arraybuffer_external_info *array_p = (ecma_arraybuffer_external_info *) ext_object_p;
223+
/* in case the arraybuffer has been detached */
224+
return array_p->buffer_p == NULL;
225+
}
226+
else
227+
{
228+
return false;
229+
}
230+
} /* ecma_arraybuffer_is_detached */
231+
206232
/**
207233
* Helper function: check if the target ArrayBuffer is detachable
208234
*

‎jerry-core/ecma/operations/ecma-arraybuffer-object.h

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ ecma_arraybuffer_get_buffer (ecma_object_t *obj_p);
4444
ecma_length_t JERRY_ATTR_PURE
4545
ecma_arraybuffer_get_length (ecma_object_t *obj_p);
4646
bool JERRY_ATTR_PURE
47+
ecma_arraybuffer_is_detached (ecma_object_t *obj_p);
48+
bool JERRY_ATTR_PURE
4749
ecma_arraybuffer_is_detachable (ecma_object_t *obj_p);
4850
bool
4951
ecma_arraybuffer_detach (ecma_object_t *obj_p);

‎jerry-core/ecma/operations/ecma-dataview-object.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@ ecma_op_dataview_create (const ecma_value_t *arguments_list_p, /**< arguments li
8484
}
8585
}
8686

87-
/* 8. TODO: Throw TypeError, when Detached ArrayBuffer will be supported. */
87+
/* 8. */
88+
if (ecma_arraybuffer_is_detached (buffer_p))
89+
{
90+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
91+
}
8892

8993
/* 9. */
9094
ecma_length_t buffer_byte_length = ecma_arraybuffer_get_length (buffer_p);
@@ -284,6 +288,10 @@ ecma_op_dataview_get_set_view_value (ecma_value_t view, /**< the operation's 'vi
284288
/* 9. */
285289
ecma_object_t *buffer_p = view_p->buffer_p;
286290
JERRY_ASSERT (ecma_object_class_is (buffer_p, LIT_MAGIC_STRING_ARRAY_BUFFER_UL));
291+
if (ecma_arraybuffer_is_detached (buffer_p))
292+
{
293+
return ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has been detached."));
294+
}
287295

288296
/* 10. */
289297
uint32_t view_offset = view_p->byte_offset;

‎jerry-core/ecma/operations/ecma-typedarray-object.c

+21-1
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,11 @@ ecma_typedarray_create_object_with_typedarray (ecma_object_t *typedarray_p, /**<
586586
ecma_typedarray_type_t typedarray_id) /**< id of the typedarray */
587587
{
588588
ecma_length_t array_length = ecma_typedarray_get_length (typedarray_p);
589+
ecma_object_t *src_arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
590+
if (ecma_arraybuffer_is_detached (src_arraybuffer_p))
591+
{
592+
return ecma_raise_type_error (ECMA_ERR_MSG ("Invalid detached ArrayBuffer."));
593+
}
589594

590595
ecma_value_t new_typedarray = ecma_typedarray_create_object_with_length (array_length,
591596
proto_p,
@@ -599,7 +604,6 @@ ecma_typedarray_create_object_with_typedarray (ecma_object_t *typedarray_p, /**<
599604

600605
ecma_object_t *new_typedarray_p = ecma_get_object_from_value (new_typedarray);
601606

602-
ecma_object_t *src_arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
603607
lit_utf8_byte_t *src_buf_p = ecma_arraybuffer_get_buffer (src_arraybuffer_p);
604608

605609
ecma_object_t *dst_arraybuffer_p = ecma_typedarray_get_arraybuffer (new_typedarray_p);
@@ -825,6 +829,12 @@ ecma_typedarray_get_length (ecma_object_t *typedarray_p) /**< the pointer to the
825829
return buffer_length >> shift;
826830
}
827831

832+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
833+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
834+
{
835+
return 0;
836+
}
837+
828838
ecma_extended_typedarray_object_t *info_p = (ecma_extended_typedarray_object_t *) ext_object_p;
829839

830840
return info_p->array_length;
@@ -847,6 +857,12 @@ ecma_typedarray_get_offset (ecma_object_t *typedarray_p) /**< the pointer to the
847857
return 0;
848858
}
849859

860+
ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (typedarray_p);
861+
if (ecma_arraybuffer_is_detached (arraybuffer_p))
862+
{
863+
return 0;
864+
}
865+
850866
ecma_extended_typedarray_object_t *info_p = (ecma_extended_typedarray_object_t *) ext_object_p;
851867

852868
return info_p->byte_offset;
@@ -947,6 +963,10 @@ ecma_op_create_typedarray (const ecma_value_t *arguments_list_p, /**< the arg li
947963
{
948964
ret = ecma_raise_range_error (ECMA_ERR_MSG ("Invalid offset."));
949965
}
966+
else if (ecma_arraybuffer_is_detached (arraybuffer_p))
967+
{
968+
ret = ecma_raise_range_error (ECMA_ERR_MSG ("Invalid detached ArrayBuffer."));
969+
}
950970
else
951971
{
952972
ecma_length_t buf_byte_length = ecma_arraybuffer_get_length (arraybuffer_p);

0 commit comments

Comments
 (0)