Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-11 15:04:23 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add null terminator in symbol name union, fixes two tests ##crash

Browse Source
This commit is contained in:
pancake 2024-03-26 22:49:41 +01:00 committed by pancake
parent cb190f0170
commit a72f663ba0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libr/bin/format/coff/coff.c
View File

@ -93,7 +93,7 @@ R_IPI char *r_coff_symbol_name(RBinCoffObj *obj, void *ptr) {
ut32 offset = 0; // offset into the string table. ut32 offset = 0; // offset into the string table.
typedef union { typedef union {
char name[8]; char name[9];
struct { struct {
ut32 zero; ut32 zero;
ut32 offset; ut32 offset;
@ -111,9 +111,11 @@ R_IPI char *r_coff_symbol_name(RBinCoffObj *obj, void *ptr) {
} }
if (*p->name == '/') { if (*p->name == '/') {
char *offset_str = (p->name + 1); char *offset_str = (p->name + 1);
no.name[8] = 0;
if (*offset_str == '/') { if (*offset_str == '/') {
r_coff_decode_base64 (p->name + 2, 6, &offset); r_coff_decode_base64 (p->name + 2, 6, &offset);
} else { } else {
// ensure null termination
offset = atoi (offset_str); offset = atoi (offset_str);
} }
} else { } else {
@ -404,7 +406,9 @@ static bool r_bin_coff_init_scn_hdr(RBinCoffObj *obj) {
if (!obj->scn_hdrs) { if (!obj->scn_hdrs) {
return false; return false;
} }
ret = r_buf_fread_at (obj->b, offset, (ut8 *)obj->scn_hdrs, obj->endian? "8c6I2S1I": "8c6i2s1i", f_nscns); ret = r_buf_fread_at (obj->b, offset, (ut8 *)obj->scn_hdrs,
obj->endian? "8c6I2S1I": "8c6i2s1i", f_nscns);
// 8 + (6*4) + (2*2) + (4) = 40
if (ret != size) { if (ret != size) {
R_FREE (obj->scn_hdrs); R_FREE (obj->scn_hdrs);
return false; return false;

5
test/db/formats/coff
View File

@ -2,11 +2,10 @@ NAME=fuzzed coffy
FILE=bins/coff/coffydis FILE=bins/coff/coffydis
CMDS=<<EOF CMDS=<<EOF
aa aa
?e ok
EOF EOF
EXPECT=<<EOF EXPECT=<<EOF
format coff ok
arm
32
EOF EOF
RUN RUN