mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-02-23 17:29:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

output: dbg,aout,elf32 -- Fix out for signed relocations

Browse Source 
@size might be negative for signed relocations but its length
is abs value. This is rather a fix for future use because at
moment we can't hit this problems but better be on a safe side.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2015-02-21 18:54:33 +03:00
parent d72bec12bc
commit 775153b1bf
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
output/outaout.c
View File

@ -677,11 +677,11 @@ static void aout_out(int32_t segto, const void *data,
}
}
p = mydata;
if (size == 2)
if (asize == 2)
WRITESHORT(p, addr);
else
WRITELONG(p, addr);
aout_sect_write(s, mydata, size);
aout_sect_write(s, mydata, asize);
} else if (type == OUT_REL2ADR) {
if (segment == segto)
nasm_error(ERR_PANIC, "intra-segment OUT_REL2ADR");

2
output/outdbg.c
View File

@ -128,7 +128,7 @@ static void dbg_out(int32_t segto, const void *data,
int id;
if (type == OUT_ADDRESS)
fprintf(ofile, "out to %"PRIx32", len = %d: ", segto, (int)size);
fprintf(ofile, "out to %"PRIx32", len = %d: ", segto, (int)abs((int)size));
else
fprintf(ofile, "out to %"PRIx32", len = %"PRIu64": ", segto, size);

4
output/outelf32.c
View File

@ -808,8 +808,8 @@ static void elf_out(int32_t segto, const void *data,
} else if (asize != 4 && segment != NO_SEG) {
nasm_error(ERR_NONFATAL, "Unsupported non-32-bit ELF relocation");
}
WRITEADDR(p, addr, size);
elf_sect_write(s, mydata, size);
WRITEADDR(p, addr, asize);
elf_sect_write(s, mydata, asize);
break;
}