mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-30 16:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

ndisasm: handle instructions at offset zero

Browse Source 
Correctly handle instructions at offset zero
This commit is contained in:
H. Peter Anvin 2007-12-20 12:24:17 -08:00
parent a81c62e18f
commit 914fdf9ba0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ndisasm.c
View File

@ -259,7 +259,8 @@ int main(int argc, char **argv)
nextsync = next_sync(offset, &synclen); nextsync = next_sync(offset, &synclen);
do { do {
uint32_t to_read = buffer + sizeof(buffer) - p; uint32_t to_read = buffer + sizeof(buffer) - p;
if (nextsync && to_read > nextsync - offset - (p - q)) if ((nextsync || synclen) &&
to_read > nextsync - offset - (p - q))
to_read = nextsync - offset - (p - q); to_read = nextsync - offset - (p - q);
if (to_read) { if (to_read) {
lenread = fread(p, 1, to_read, fp); lenread = fread(p, 1, to_read, fp);
@ -268,7 +269,8 @@ int main(int argc, char **argv)
} else } else
lenread = 0; lenread = 0;
p += lenread; p += lenread;
if (nextsync && (uint32_t)offset == nextsync) { if ((nextsync || synclen) &&
(uint32_t)offset == nextsync) {
if (synclen) { if (synclen) {
fprintf(stdout, "%08"PRIX32" skipping 0x%"PRIX32" bytes\n", offset, synclen); fprintf(stdout, "%08"PRIX32" skipping 0x%"PRIX32" bytes\n", offset, synclen);
offset += synclen; offset += synclen;
@ -282,7 +284,8 @@ int main(int argc, char **argv)
disasm((uint8_t *) q, outbuf, sizeof(outbuf), bits, offset, autosync, disasm((uint8_t *) q, outbuf, sizeof(outbuf), bits, offset, autosync,
prefer); prefer);
if (!lendis || lendis > (p - q) if (!lendis || lendis > (p - q)
|| (uint32_t)lendis > nextsync - offset) || ((nextsync || synclen) &&
(uint32_t)lendis > nextsync - offset))
lendis = eatbyte((uint8_t *) q, outbuf, sizeof(outbuf)); lendis = eatbyte((uint8_t *) q, outbuf, sizeof(outbuf));
output_ins(offset, (uint8_t *) q, lendis, outbuf); output_ins(offset, (uint8_t *) q, lendis, outbuf);
q += lendis; q += lendis;