Skip to content

Commit 950a0f1

Browse files
Zsolt Borbélyyichoi
authored andcommitted
Fix a few issues which can lead to undefined-behaviour (#1730)
JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély [email protected]
1 parent 605e984 commit 950a0f1

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

jerry-core/ecma/base/ecma-helpers-value.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ ecma_make_integer_value (ecma_integer_value_t integer_value) /**< integer number
370370
{
371371
JERRY_ASSERT (ECMA_IS_INTEGER_NUMBER (integer_value));
372372

373-
return ((ecma_value_t) (integer_value << ECMA_DIRECT_SHIFT)) | ECMA_DIRECT_TYPE_INTEGER_VALUE;
373+
return (((ecma_value_t) integer_value) << ECMA_DIRECT_SHIFT) | ECMA_DIRECT_TYPE_INTEGER_VALUE;
374374
} /* ecma_make_integer_value */
375375

376376
/**

jerry-core/parser/regexp/re-bytecode.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ re_bytecode_list_insert (re_bytecode_ctx_t *bc_ctx_p, /**< RegExp bytecode conte
126126
inline ecma_char_t __attr_always_inline___
127127
re_get_char (uint8_t **bc_p) /**< pointer to bytecode start */
128128
{
129-
ecma_char_t chr = *((ecma_char_t *) *bc_p);
129+
ecma_char_t chr;
130+
memcpy (&chr, *bc_p, sizeof (ecma_char_t));
130131
(*bc_p) += sizeof (ecma_char_t);
131132
return chr;
132133
} /* re_get_char */
@@ -152,7 +153,8 @@ re_get_opcode (uint8_t **bc_p) /**< pointer to bytecode start */
152153
inline uint32_t __attr_always_inline___
153154
re_get_value (uint8_t **bc_p) /**< pointer to bytecode start */
154155
{
155-
uint32_t value = *((uint32_t *) *bc_p);
156+
uint32_t value;
157+
memcpy (&value, *bc_p, sizeof (uint32_t));
156158
(*bc_p) += sizeof (uint32_t);
157159
return value;
158160
} /* re_get_value */

jerry-core/vm/vm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2754,7 +2754,8 @@ vm_run (const ecma_compiled_code_t *bytecode_header_p, /**< byte-code data heade
27542754
frame_ctx.is_eval_code = is_eval_code;
27552755
frame_ctx.call_operation = VM_NO_EXEC_OP;
27562756

2757-
ecma_value_t stack[call_stack_size];
2757+
/* Use JERRY_MAX() to avoid array declaration with size 0. */
2758+
ecma_value_t stack[JERRY_MAX (call_stack_size, 1)];
27582759
frame_ctx.registers_p = stack;
27592760

27602761
return vm_execute (&frame_ctx, arg_list_p, arg_list_len);

0 commit comments

Comments
 (0)