Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-01 11:11:56 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix another bug in strbuf

Browse Source
This commit is contained in:
pancake 2015-09-28 03:20:53 +02:00
parent bccdb8d347
commit ec5bab3692
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/debug/debug.c
View File

@ -347,6 +347,7 @@ R_API int r_debug_wait(RDebug *dbg) {
//eprintf ("wait = %d\n", ret);
if (dbg->trace->enabled)
r_debug_trace_pc (dbg);
dbg->reason.type = ret;
if (ret == R_DEBUG_REASON_SIGNAL && dbg->reason.signum != -1) {
/* handle signal on continuations here */
int what = r_debug_signal_what (dbg, dbg->reason.signum);

17
libr/util/strbuf.c
View File

@ -61,22 +61,21 @@ R_API int r_strbuf_setf(RStrBuf *sb, const char *fmt, ...) {
R_API int r_strbuf_append(RStrBuf *sb, const char *s) {
int l = strlen (s);
if ((sb->len+l+1)<sizeof (sb->buf)) {
memcpy (sb->buf+sb->len, s, l);
if ((sb->len+l+1) < sizeof (sb->buf)) {
memcpy (sb->buf+sb->len, s, l+1);
sb->ptr = NULL;
} else {
char *d, *p;
d = sb->ptr?sb->ptr:sb->buf;
p = malloc (sb->len+l);
if (!p) return R_FALSE;
p = malloc (sb->len+l+1);
if (!p) return false;
memcpy (p, d, sb->len);
memcpy (p+sb->len, s, l);
memcpy (p+sb->len, s, l+1);
free (sb->ptr);
sb->ptr = p;
}
sb->len += l;
sb->buf[sb->len] = 0;
return R_TRUE;
return true;
}
R_API int r_strbuf_appendf(RStrBuf *sb, const char *fmt, ...) {
@ -86,11 +85,11 @@ R_API int r_strbuf_appendf(RStrBuf *sb, const char *fmt, ...) {
va_start (ap, fmt);
ret = vsnprintf (string, sizeof (string), fmt, ap);
if (ret>=sizeof (string)) {
if (ret >= sizeof (string)) {
char *p = malloc (ret+2);
if (!p) {
va_end (ap);
return R_FALSE;
return false;
}
vsnprintf (p, ret+1, fmt, ap);
ret = r_strbuf_append (sb, p);