Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-18 21:28:15 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

wv1,2,4,8 accept many space-separated numbers now ##shell

Browse Source
This commit is contained in:
pancake 2021-08-19 18:09:00 +02:00 committed by GitHub
parent a58b095ab7
commit 25a2e50ad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
libr/core/cmd_write.c
View File

@ -159,7 +159,7 @@ static const char *help_msg_wv[] = {
"wv", " 0x834002", "write dword with this value",
"wv1", " 234", "write one byte with this value",
"wv2", " 234", "write unsigned short (2 bytes) with this number",
"wv4", " 234", "write dword (4 bytes) with this number",
"wv4", " 1 2 3", "write N space-separated dword (4 bytes)",
"wv8", " 234", "write qword (8 bytes) with this number",
"wvf", " 3.14", "write float value (4 bytes)",
"wvF", " 3.14", "write double value (8 bytes)",
@ -502,51 +502,63 @@ static void cmd_write_value(RCore *core, const char *input) {
case '4': type = 4; break;
case '8': type = 8; break;
}
if (input[0] && input[1]) {
off = r_num_math (core->num, input+1);
}
if (core->io->desc) {
r_io_use_fd (core->io, core->io->desc->fd);
}
ut64 res = r_io_seek (core->io, core->offset, R_IO_SEEK_SET);
if (res == UT64_MAX) return;
if (type == 0) {
type = (off&UT64_32U)? 8: 4;
}
switch (type) {
case 1:
r_write_ble8 (buf, (ut8)(off & UT8_MAX));
if (!r_io_write (core->io, buf, 1)) {
cmd_write_fail (core);
} else {
WSEEK (core, 1);
ut64 addr = core->offset;
char *inp = r_str_trim_dup (input + 1);
RList *list = r_str_split_list (inp, " ", 0); // or maybe comma :?
char *cinp;
RListIter *iter;
r_list_foreach (list, iter, cinp) {
if (input[0] && input[1]) {
off = r_num_math (core->num, cinp);
}
break;
case 2:
r_write_ble16 (buf, (ut16)(off & UT16_MAX), be);
if (!r_io_write (core->io, buf, 2)) {
cmd_write_fail (core);
} else {
WSEEK (core, 2);
if (core->io->desc) {
r_io_use_fd (core->io, core->io->desc->fd);
}
break;
case 4:
r_write_ble32 (buf, (ut32)(off & UT32_MAX), be);
if (!r_io_write (core->io, buf, 4)) {
cmd_write_fail (core);
} else {
WSEEK (core, 4);
ut64 res = r_io_seek (core->io, addr, R_IO_SEEK_SET);
if (res == UT64_MAX) {
return;
}
break;
case 8:
r_write_ble64 (buf, off, be);
if (!r_io_write (core->io, buf, 8)) {
cmd_write_fail (core);
} else {
WSEEK (core, 8);
if (type == 0) {
type = (off & UT64_32U)? 8: 4;
}
break;
switch (type) {
case 1:
r_write_ble8 (buf, (ut8)(off & UT8_MAX));
if (!r_io_write (core->io, buf, 1)) {
cmd_write_fail (core);
} else {
WSEEK (core, 1);
}
break;
case 2:
r_write_ble16 (buf, (ut16)(off & UT16_MAX), be);
if (!r_io_write (core->io, buf, 2)) {
cmd_write_fail (core);
} else {
WSEEK (core, 2);
}
break;
case 4:
r_write_ble32 (buf, (ut32)(off & UT32_MAX), be);
if (!r_io_write (core->io, buf, 4)) {
cmd_write_fail (core);
} else {
WSEEK (core, 4);
}
break;
case 8:
r_write_ble64 (buf, off, be);
if (!r_io_write (core->io, buf, 8)) {
cmd_write_fail (core);
} else {
WSEEK (core, 8);
}
break;
}
addr += type;
}
r_list_free (list);
free (inp);
r_core_block_read (core);
}

17
test/db/cmd/cmd_w
View File

@ -1,3 +1,20 @@
NAME=wv4
FILE=-
CMDS=<<EOF
wv4 1 2 3 4
p8 16
wv2 1 2 3 4 5 6 7 8
p8 16
wv1 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
p8 16
EOF
EXPECT=<<EOF
01000000020000000300000004000000
01000200030004000500060007000800
0102030405060708090a0b0c0d0e0f10
EOF
RUN
NAME=wan
FILE=-
CMDS=<<EOF