Skip to content

avoid out-of-bounds opcode read in JS_ReadFunctionBytecode #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uwezkhan wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −0
Open

avoid out-of-bounds opcode read in JS_ReadFunctionBytecode #519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37545,6 +37545,8 @@ static void bc_byte_swap(uint8_t *bc_buf, int bc_len)
while (pos < bc_len) {
op = bc_buf[pos];
len = short_opcode_info(op).size;
if (pos + len > bc_len)
break;
fmt = short_opcode_info(op).fmt;
switch(fmt) {
case OP_FMT_u16:
Expand Down Expand Up @@ -38523,6 +38525,12 @@ static int JS_ReadFunctionBytecode(BCReaderState *s, JSFunctionBytecode *b,
while (pos < bc_len) {
op = bc_buf[pos];
len = short_opcode_info(op).size;
if (unlikely(pos + len > bc_len)) {
/* the opcode reads past the end of the bytecode: avoid
fetching or relocating an atom out of bounds */
b->byte_code_len = pos;
return bc_read_error_end(s);
}
switch(short_opcode_info(op).fmt) {
case OP_FMT_atom:
case OP_FMT_atom_u8:
Expand Down