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

Fix #2910 - two oob read with the command wo2

Browse Source
This commit is contained in:
Álvaro Felipe Melchor 2015-07-12 20:48:11 +02:00 committed by pancake
parent be7b1edd2e
commit 76c5cc9c54
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libr/core/cmd_write.c
View File

@ -71,8 +71,10 @@ static void cmd_write_op (RCore *core, const char *input) {
}
case '2':
case '4':
r_core_write_op (core, input+3, input[1]);
r_core_block_read (core, 0);
if (input[2]){
r_core_write_op (core, input+3, input[1]);
r_core_block_read (core, 0);
}
break;
case 'R':
r_core_cmd0 (core, "wr $b");

3
libr/core/io.c
View File

@ -150,7 +150,8 @@ R_API int r_core_write_op(RCore *core, const char *arg, char op) {
} else
if (op=='2' || op=='4') {
op -= '0';
for (i=0; i<core->blocksize; i+=op) {
// if i < core->blocksize would pass the test but buf[i+3] goes beyond the buffer
for (i=0; i<core->blocksize-3; i+=op) {
/* endian swap */
ut8 tmp = buf[i];
buf[i] = buf[i+3];