Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-14 08:49:50 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix #1699 - Double free with aa

Browse Source
This commit is contained in:
pancake 2014-11-18 23:00:13 +01:00
parent b7e1dc4354
commit 1f685fc8df
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libr/util/buf.c
View File

@ -260,22 +260,21 @@ R_API ut8 *r_buf_get_at (RBuffer *b, ut64 addr, int *left) {
R_API int r_buf_read_at(RBuffer *b, ut64 addr, ut8 *buf, int len) {
st64 pa;
if (!b) return 0;
if (addr == UT64_MAX)
return 0;
if (addr == R_BUF_CUR)
addr = b->cur;
pa = addr - b->base;
if (pa<0)
if (addr < b->base)
return 0;
#if 1
pa = addr - b->base;
if (pa+len > b->length) {
len = b->length - pa;
if (len<0)
return 0;
memset (buf+pa, 0xff, len);
memset (buf, 0xff, len);
}
#else
/* if we avoid partial reads it breaks stuff */
if (addr-b->base+len > b->length) return 0;
#endif
// must be +pa, but maybe its missused?
//return r_buf_cpy (b, addr, buf, b->buf+pa, len, R_FALSE);
return r_buf_cpy (b, addr, buf, b->buf, len, R_FALSE);
}