Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-14 19:08:04 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix #12973 - Fix 1 byte oobread when running in asan

Browse Source
This commit is contained in:
pancake 2019-02-03 15:37:21 +01:00
parent 7c04189a2f
commit beacb0bcd9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libr/anal/fcn.c
View File

@ -1007,11 +1007,13 @@ repeat:
if ((oplen = r_anal_op (anal, &op, addr + idx, buf + (addrbytes * idx), len - (addrbytes * idx), R_ANAL_OP_MASK_ALL)) < 1) {
RCore *core = anal->coreb.core;
if (!core || !core->bin || !core->bin->is_debugger) { // HACK
ut8 v = buf[addrbytes*idx] == 0xff;
v += buf[addrbytes*(idx+1)] == 0xff;
v += buf[addrbytes*(idx+2)] == 0xff;
v += buf[addrbytes*(idx+3)] == 0xff;
ut8 v = 0;
if (addrbytes * (idx + 3) < len) {
v += buf[addrbytes*idx] == 0xff;
v += buf[addrbytes*(idx+1)] == 0xff;
v += buf[addrbytes*(idx+2)] == 0xff;
v += buf[addrbytes*(idx+3)] == 0xff;
}
if (v < 2) {
// check if this is data, then just skip
const char *reason = (len - (addrbytes * idx) < 4)? "Truncated": "Invalid";