fries/quickjs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove broken JS_READ_OBJ_ROM_DATA flag (#216)

Browse source 
This JS_ReadObject() flag no longer works for bytecode. The IC opcodes
are patched during execution.

Fixes: https://github.com/quickjs-ng/quickjs/issues/206
Refs: https://github.com/quickjs-ng/quickjs/pull/120
This commit is contained in:
Ben Noordhuis 2023-12-14 15:25:29 +01:00 committed by GitHub
parent e5812862f9
commit ba8b80f112
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
quickjs.c
View file

@ -626,8 +626,7 @@ typedef struct JSFunctionBytecode {
uint8_t super_allowed : 1; uint8_t super_allowed : 1;
uint8_t arguments_allowed : 1; uint8_t arguments_allowed : 1;
uint8_t backtrace_barrier : 1; /* stop backtrace on this function */ uint8_t backtrace_barrier : 1; /* stop backtrace on this function */
uint8_t read_only_bytecode : 1; /* XXX: 5 bits available */
/* XXX: 4 bits available */
uint8_t *byte_code_buf; /* (self pointer) */ uint8_t *byte_code_buf; /* (self pointer) */
int byte_code_len; int byte_code_len;
JSAtom func_name; JSAtom func_name;
@ -5770,7 +5769,7 @@ static void compute_bytecode_size(JSFunctionBytecode *b, JSMemoryUsage_helper *h
if (b->closure_var) { if (b->closure_var) {
js_func_size += b->closure_var_count * sizeof(*b->closure_var); js_func_size += b->closure_var_count * sizeof(*b->closure_var);
} }
if (!b->read_only_bytecode && b->byte_code_buf) { if (b->byte_code_buf) {
hp->js_func_code_size += b->byte_code_len; hp->js_func_code_size += b->byte_code_len;
} }
memory_used_count++; memory_used_count++;
@ -32117,7 +32116,7 @@ typedef enum BCTagEnum {
BC_TAG_OBJECT_REFERENCE, BC_TAG_OBJECT_REFERENCE,
} BCTagEnum; } BCTagEnum;
#define BC_VERSION 6 #define BC_VERSION 7
typedef struct BCWriterState { typedef struct BCWriterState {
JSContext *ctx; JSContext *ctx;
@ -32981,7 +32980,6 @@ typedef struct BCReaderState {
int error_state; int error_state;
BOOL allow_sab : 8; BOOL allow_sab : 8;
BOOL allow_bytecode : 8; BOOL allow_bytecode : 8;
BOOL is_rom_data : 8;
BOOL allow_reference : 8; BOOL allow_reference : 8;
/* object references */ /* object references */
JSObject **objects; JSObject **objects;
@ -33213,17 +33211,9 @@ static int JS_ReadFunctionBytecode(BCReaderState *s, JSFunctionBytecode *b,
JSAtom atom; JSAtom atom;
uint32_t idx; uint32_t idx;
if (s->is_rom_data) { bc_buf = (uint8_t*)b + byte_code_offset;
/* directly use the input buffer */ if (bc_get_buf(s, bc_buf, bc_len))
if (unlikely(s->buf_end - s->ptr < bc_len)) return -1;
return bc_read_error_end(s);
bc_buf = (uint8_t *)s->ptr;
s->ptr += bc_len;
} else {
bc_buf = (void *)((uint8_t*)b + byte_code_offset);
if (bc_get_buf(s, bc_buf, bc_len))
return -1;
}
b->byte_code_buf = bc_buf; b->byte_code_buf = bc_buf;
pos = 0; pos = 0;
@ -33237,20 +33227,15 @@ static int JS_ReadFunctionBytecode(BCReaderState *s, JSFunctionBytecode *b,
case OP_FMT_atom_label_u8: case OP_FMT_atom_label_u8:
case OP_FMT_atom_label_u16: case OP_FMT_atom_label_u16:
idx = get_u32(bc_buf + pos + 1); idx = get_u32(bc_buf + pos + 1);
if (s->is_rom_data) { if (bc_idx_to_atom(s, &atom, idx)) {
/* just increment the reference count of the atom */ /* Note: the atoms will be freed up to this position */
JS_DupAtom(s->ctx, (JSAtom)idx); b->byte_code_len = pos;
} else { return -1;
if (bc_idx_to_atom(s, &atom, idx)) {
/* Note: the atoms will be freed up to this position */
b->byte_code_len = pos;
return -1;
}
put_u32(bc_buf + pos + 1, atom);
#ifdef DUMP_READ_OBJECT
bc_read_trace(s, "at %d, fixup atom: ", pos + 1); print_atom(s->ctx, atom); printf("\n");
#endif
} }
put_u32(bc_buf + pos + 1, atom);
#ifdef DUMP_READ_OBJECT
bc_read_trace(s, "at %d, fixup atom: ", pos + 1); print_atom(s->ctx, atom); printf("\n");
#endif
break; break;
default: default:
break; break;
@ -33394,7 +33379,6 @@ static JSValue JS_ReadFunctionTag(BCReaderState *s)
bc.super_allowed = bc_get_flags(v16, &idx, 1); bc.super_allowed = bc_get_flags(v16, &idx, 1);
bc.arguments_allowed = bc_get_flags(v16, &idx, 1); bc.arguments_allowed = bc_get_flags(v16, &idx, 1);
bc.backtrace_barrier = bc_get_flags(v16, &idx, 1); bc.backtrace_barrier = bc_get_flags(v16, &idx, 1);
bc.read_only_bytecode = s->is_rom_data;
if (bc_get_u8(s, &v8)) if (bc_get_u8(s, &v8))
goto fail; goto fail;
bc.js_mode = v8; bc.js_mode = v8;
@ -33425,9 +33409,7 @@ static JSValue JS_ReadFunctionTag(BCReaderState *s)
closure_var_offset = function_size; closure_var_offset = function_size;
function_size += bc.closure_var_count * sizeof(*bc.closure_var); function_size += bc.closure_var_count * sizeof(*bc.closure_var);
byte_code_offset = function_size; byte_code_offset = function_size;
if (!bc.read_only_bytecode) { function_size += bc.byte_code_len;
function_size += bc.byte_code_len;
}
b = js_mallocz(ctx, function_size); b = js_mallocz(ctx, function_size);
if (!b) if (!b)
@ -34071,8 +34053,6 @@ static int JS_ReadObjectAtoms(BCReaderState *s)
if (atom == JS_ATOM_NULL) if (atom == JS_ATOM_NULL)
return s->error_state = -1; return s->error_state = -1;
s->idx_to_atom[i] = atom; s->idx_to_atom[i] = atom;
if (s->is_rom_data && (atom != (i + s->first_atom)))
s->is_rom_data = FALSE; /* atoms must be relocated */
} }
bc_read_trace(s, "}\n"); bc_read_trace(s, "}\n");
return 0; return 0;
@ -34105,7 +34085,6 @@ JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len,
s->buf_end = buf + buf_len; s->buf_end = buf + buf_len;
s->ptr = buf; s->ptr = buf;
s->allow_bytecode = ((flags & JS_READ_OBJ_BYTECODE) != 0); s->allow_bytecode = ((flags & JS_READ_OBJ_BYTECODE) != 0);
s->is_rom_data = ((flags & JS_READ_OBJ_ROM_DATA) != 0);
s->allow_sab = ((flags & JS_READ_OBJ_SAB) != 0); s->allow_sab = ((flags & JS_READ_OBJ_SAB) != 0);
s->allow_reference = ((flags & JS_READ_OBJ_REFERENCE) != 0); s->allow_reference = ((flags & JS_READ_OBJ_REFERENCE) != 0);
if (s->allow_bytecode) if (s->allow_bytecode)

2
quickjs.h
View file

@ -812,7 +812,7 @@ JS_EXTERN uint8_t *JS_WriteObject2(JSContext *ctx, size_t *psize, JSValue obj,
int flags, uint8_t ***psab_tab, size_t *psab_tab_len); int flags, uint8_t ***psab_tab, size_t *psab_tab_len);
#define JS_READ_OBJ_BYTECODE (1 << 0) /* allow function/module */ #define JS_READ_OBJ_BYTECODE (1 << 0) /* allow function/module */
#define JS_READ_OBJ_ROM_DATA (1 << 1) /* avoid duplicating 'buf' data */ #define JS_READ_OBJ_ROM_DATA (0) /* avoid duplicating 'buf' data (obsolete, broken by ICs) */
#define JS_READ_OBJ_SAB (1 << 2) /* allow SharedArrayBuffer */ #define JS_READ_OBJ_SAB (1 << 2) /* allow SharedArrayBuffer */
#define JS_READ_OBJ_REFERENCE (1 << 3) /* allow object references */ #define JS_READ_OBJ_REFERENCE (1 << 3) /* allow object references */
JS_EXTERN JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len, int flags); JS_EXTERN JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len, int flags);