Gracefully throw an error when parser runs out of memory.
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
@@ -39,8 +39,9 @@ parser_malloc (parser_context_t *context_p, /**< context */
|
||||
void *result;
|
||||
|
||||
JERRY_ASSERT (size > 0);
|
||||
result = jmem_heap_alloc_block (size);
|
||||
if (result == 0)
|
||||
result = jmem_heap_alloc_block_null_on_error (size);
|
||||
|
||||
if (result == NULL)
|
||||
{
|
||||
parser_raise_error (context_p, PARSER_ERR_OUT_OF_MEMORY);
|
||||
}
|
||||
|
||||
@@ -2241,6 +2241,13 @@ parser_parse_script (const uint8_t *source_p, /**< source code */
|
||||
|
||||
if (!*bytecode_data_p)
|
||||
{
|
||||
if (parse_error.error == PARSER_ERR_OUT_OF_MEMORY)
|
||||
{
|
||||
/* It is unlikely that memory can be allocated in an out-of-memory
|
||||
* situation. However, a simple value can still be thrown. */
|
||||
return ecma_make_error_value (ecma_make_simple_value (ECMA_SIMPLE_VALUE_NULL));
|
||||
}
|
||||
|
||||
return ecma_raise_syntax_error (parser_error_to_string (parse_error.error));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user