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

Fix another null arena deref

Browse Source
This commit is contained in:
pancake 2019-08-30 04:35:17 +02:00
parent e4004eedca
commit 42623c65d9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libr/reg/value.c
View File

@ -123,7 +123,6 @@ R_API ut64 r_reg_get_value_by_role(RReg *reg, RRegisterId role) {
}
R_API bool r_reg_set_value(RReg *reg, RRegItem *item, ut64 value) {
int fits_in_arena;
ut8 bytes[12];
ut8 *src = bytes;
r_return_val_if_fail (reg && item, false);
@ -184,12 +183,15 @@ R_API bool r_reg_set_value(RReg *reg, RRegItem *item, ut64 value) {
eprintf ("r_reg_set_value: Bit size %d not supported\n", item->size);
return false;
}
fits_in_arena = (reg->regset[item->arena].arena->size - BITS2BYTES (item->offset) - BITS2BYTES (item->size)) >= 0;
if (src && fits_in_arena) {
r_mem_copybits (reg->regset[item->arena].arena->bytes +
BITS2BYTES (item->offset),
src, item->size);
return true;
RRegArena *arena = reg->regset[item->arena].arena;
if (arena) {
const bool fits_in_arena = (arena->size - BITS2BYTES (item->offset) - BITS2BYTES (item->size)) >= 0;
if (src && fits_in_arena) {
r_mem_copybits (reg->regset[item->arena].arena->bytes +
BITS2BYTES (item->offset),
src, item->size);
return true;
}
}
eprintf ("r_reg_set_value: Cannot set %s to 0x%" PFMT64x "\n", item->name, value);
return false;