Skip to content

Commit e4044cf

Browse files
author
H. Peter Anvin
committed
assemble.c: avoid a panic after invalid instruction error
If an instruction triggers an error (nasm_nonfatal) it is legitimate for calcsize() to return 0; in that case no further processing is needed. Signed-off-by: H. Peter Anvin (Intel) <[email protected]>
1 parent 6df250a commit e4044cf

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

asm/assemble.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,11 @@ static int64_t assemble(insn *instruction)
983983
}
984984

985985
data.inslen = calcsize(instruction, temp);
986-
nasm_assert(data.inslen >= 0);
986+
987+
/* This can happen if the instruction generated an error */
988+
if (data.inslen <= 0)
989+
return 0;
990+
987991
data.inslen = merge_resb(instruction, data.inslen);
988992

989993
data.insoffs = 0;

0 commit comments

Comments
 (0)