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

Reduce stackframe usage in exchange for the heap for portability (#18824)

Browse Source
This commit is contained in:
pancake 2021-06-10 16:13:38 +02:00 committed by GitHub
parent b545c72017
commit f49ba3a948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 63 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/cons/dietline.c
View File

@ -1109,7 +1109,7 @@ static void __vi_mode(void) {
if (I.echo) {
__print_prompt ();
}
if (I.vi_mode != CONTROL_MODE) { // exit if insert mode is selected
if (I.vi_mode != CONTROL_MODE) { // exit if insert mode is selected
__update_prompt_color ();
break;
}

27
libr/cons/input.c
View File

@ -690,11 +690,10 @@ R_API bool r_cons_yesno(int def, const char *fmt, ...) {
R_API char *r_cons_password(const char *msg) {
int i = 0;
char buf[256] = {0};
printf ("\r%s", msg);
fflush (stdout);
r_cons_set_raw (1);
#if __UNIX__
#if __UNIX__ && !__wasi__
RCons *a = r_cons_singleton ();
a->term_raw.c_lflag &= ~(ECHO | ECHONL);
// // required to make therm/iterm show the key
@ -703,7 +702,12 @@ R_API char *r_cons_password(const char *msg) {
tcsetattr (0, TCSADRAIN, &a->term_raw);
r_sys_signal (SIGTSTP, SIG_IGN);
#endif
while (i < sizeof (buf) - 1) {
const size_t buf_size = 256;
char *buf = malloc (buf_size);
if (!buf) {
return NULL;
}
while (i < buf_size - 1) {
int ch = r_cons_readchar ();
if (ch == 127) { // backspace
if (i < 1) {
@ -723,7 +727,7 @@ R_API char *r_cons_password(const char *msg) {
#if __UNIX__
r_sys_signal (SIGTSTP, SIG_DFL);
#endif
return strdup (buf);
return buf;
}
R_API char *r_cons_input(const char *msg) {
@ -731,15 +735,18 @@ R_API char *r_cons_input(const char *msg) {
if (!oprompt) {
return NULL;
}
char buf[1024];
if (msg) {
r_line_set_prompt (msg);
} else {
r_line_set_prompt ("");
}
buf[0] = 0;
r_cons_fgets (buf, sizeof (buf), 0, NULL);
r_line_set_prompt (oprompt);
free (oprompt);
return strdup (buf);
size_t buf_size = 1024;
char *buf = malloc (buf_size);
if (buf) {
*buf = 0;
r_cons_fgets (buf, buf_size, 0, NULL);
r_line_set_prompt (oprompt);
free (oprompt);
}
return buf;
}

72
libr/core/cmd.c
View File

@ -853,7 +853,11 @@ static void cmd_remote(RCore *core, const char *input, bool retry) {
RSocket *s = r_socket_new (false);
repeat:
if (r_socket_connect (s, host, port, R_SOCKET_PROTO_TCP, 1500)) {
char buf[1024];
const size_t buf_size = 1024;
char *buf = calloc (buf_size, 1);
if (!buf) {
return;
}
void *bed = r_cons_sleep_begin ();
r_cons_break_push (NULL, NULL);
for (;;) {
@ -862,9 +866,9 @@ repeat:
}
r_socket_printf (s, "[0x%08"PFMT64x"]> ", core->offset);
r_socket_flush (s);
memset (buf, 0, sizeof (buf));
memset (buf, 0, buf_size);
r_socket_block_time (s, true, 99999, 0);
if (r_socket_read (s, (ut8*)buf, sizeof (buf) - 1) < 1) {
if (r_socket_read (s, (ut8*)buf, buf_size - 1) < 1) {
break;
}
if (*buf == 'q') {
@ -880,6 +884,7 @@ repeat:
}
r_cons_break_pop ();
r_cons_sleep_end (bed);
free (buf);
} else {
if (retry) {
r_sys_sleep (1);
@ -1937,7 +1942,7 @@ R_API int r_line_hist_sdb_down(RLine *line) {
}
static int cmd_kuery(void *data, const char *input) {
char buf[1024], *out;
char *out;
RCore *core = (RCore*)data;
const char *sp, *p = "[sdb]> ";
Sdb *s = core->sdb;
@ -2044,9 +2049,12 @@ static int cmd_kuery(void *data, const char *input) {
}
RList *sdb_hist = line->sdbshell_hist;
r_line_set_hist_callback (line, &r_line_hist_sdb_up, &r_line_hist_sdb_down);
for (;;) {
const size_t buf_size = 1024;
char *buf = malloc (1024);
while (buf) {
r_line_set_prompt (p);
if (r_cons_fgets (buf, sizeof (buf), 0, NULL) < 1) {
*buf = 0;
if (r_cons_fgets (buf, buf_size, 0, NULL) < 1) {
break;
}
if (!*buf) {
@ -2064,6 +2072,7 @@ static int cmd_kuery(void *data, const char *input) {
r_cons_flush ();
}
}
free (buf);
r_line_set_hist_callback (core->cons->line, &r_line_hist_cmd_up, &r_line_hist_cmd_down);
break;
case 'o': // "ko"
@ -5087,7 +5096,6 @@ R_API int r_core_cmd_foreach(RCore *core, const char *cmd, char *each) {
break;
case '.': // "@@."
if (each[1] == '(') {
char cmd2[1024];
// XXX what's this 999 ?
i = 0;
for (core->rcmd->macro.counter = 0; i < 999; core->rcmd->macro.counter++) {
@ -5099,36 +5107,37 @@ R_API int r_core_cmd_foreach(RCore *core, const char *cmd, char *each) {
break;
}
addr = core->rcmd->macro._brk_value;
sprintf (cmd2, "%s @ 0x%08"PFMT64x"", cmd, addr);
eprintf ("0x%08"PFMT64x" (%s)\n", addr, cmd2);
r_core_seek (core, addr, true);
r_core_cmd (core, cmd2, 0);
r_core_cmdf (core, "%s @ 0x%08"PFMT64x"", cmd, addr);
if (foreach_newline (core)) {
break;
}
i++;
}
} else {
char buf[1024];
char cmd2[1024];
FILE *fd = r_sandbox_fopen (each + 1, "r");
if (fd) {
core->rcmd->macro.counter = 0;
while (!feof (fd)) {
buf[0] = '\0';
if (!fgets (buf, sizeof (buf), fd)) {
break;
size_t buf_size = 1024;
char *buf = calloc (buf_size, 1);
if (buf) {
while (!feof (fd)) {
buf[0] = '\0';
if (!fgets (buf, buf_size, fd)) {
break;
}
if (*buf) {
addr = r_num_math (core->num, buf);
r_core_seek (core, addr, true); // XXX
r_core_cmdf (core, "%s @ 0x%08"PFMT64x"", cmd, addr);
if (foreach_newline (core)) {
break;
}
core->rcmd->macro.counter++;
}
}
addr = r_num_math (core->num, buf);
eprintf ("0x%08"PFMT64x": %s\n", addr, cmd);
sprintf (cmd2, "%s @ 0x%08"PFMT64x"", cmd, addr);
r_core_seek (core, addr, true); // XXX
r_core_cmd (core, cmd2, 0);
if (foreach_newline (core)) {
break;
}
core->rcmd->macro.counter++;
}
free (buf);
fclose (fd);
} else {
eprintf ("cannot open file '%s' to read offsets\n", each + 1);
@ -5459,12 +5468,11 @@ R_API int r_core_cmd_buffer(RCore *core, const char *buf) {
}
R_API int r_core_cmdf(RCore *core, const char *fmt, ...) {
char string[4096];
int ret;
va_list ap;
va_start (ap, fmt);
vsnprintf (string, sizeof (string), fmt, ap);
ret = r_core_cmd (core, string, 0);
char *cmd = r_str_newvf (fmt, ap);
int ret = r_core_cmd (core, cmd, 0);
free (cmd);
va_end (ap);
return ret;
}
@ -5519,11 +5527,11 @@ R_API char *r_core_cmd_str_pipe(RCore *core, const char *cmd) {
}
R_API char *r_core_cmd_strf(RCore *core, const char *fmt, ...) {
char string[4096];
va_list ap;
va_start (ap, fmt);
vsnprintf (string, sizeof (string), fmt, ap);
char *ret = r_core_cmd_str (core, string);
char *cmd = r_str_newvf (fmt, ap);
char *ret = r_core_cmd_str (core, cmd);
free (cmd);
va_end (ap);
return ret;
}

4
libr/util/signal.c
View File

@ -48,7 +48,7 @@ static struct {
{ NULL }
};
R_API int r_signal_from_string (const char *e) {
R_API int r_signal_from_string(const char *e) {
int i;
for (i = 1; signals[i].name; i++) {
const char *str = signals[i].name;
@ -59,7 +59,7 @@ R_API int r_signal_from_string (const char *e) {
return atoi (e);
}
R_API const char* r_signal_to_string (int code) {
R_API const char* r_signal_to_string(int code) {
int i;
for (i = 1; signals[i].name; i++) {
if (signals[i].code == code) {

6
libr/util/str.c
View File

@ -278,16 +278,16 @@ R_API char *r_str_home(const char *str) {
}
}
length = strlen (home) + 1;
if (!R_STR_ISEMPTY (str)) {
if (R_STR_ISNOTEMPTY (str)) {
length += strlen (R_SYS_DIR) + strlen (str);
}
dst = (char *)malloc (length);
dst = (char *)calloc (1, length);
if (!dst) {
goto fail;
}
int home_len = strlen (home);
memcpy (dst, home, home_len + 1);
if (!R_STR_ISEMPTY (str)) {
if (R_STR_ISNOTEMPTY (str)) {
dst[home_len] = R_SYS_DIR[0];
strcpy (dst + home_len + 1, str);
}