From: Tom Tromey Date: Sun, 19 Jan 2014 02:25:57 +0000 (-0700) Subject: don't let hexify call strlen X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a822afbcdf6aee6c25a840e4785ad3af56a94fd;p=binutils-gdb.git don't let hexify call strlen hexify had the same issue as bin2hex; and the fix is the same. 2014-02-12 Tom Tromey * common/rsp-low.c (hexify): Never take strlen of argument. 2014-02-12 Tom Tromey * remote-utils.c (monitor_output): Pass explicit length to hexify. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e1dfbbb6239..e8521c9ac17 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2014-02-12 Tom Tromey + + * common/rsp-low.c (hexify): Never take strlen of argument. + 2014-02-12 Tom Tromey * common/rsp-low.c (bin2hex): Never take strlen of argument. diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c index 7f0445cb250..fd6f56345c6 100644 --- a/gdb/common/rsp-low.c +++ b/gdb/common/rsp-low.c @@ -177,10 +177,6 @@ hexify (char *hex, const char *bin, int count) { int i; - /* May use a length, or a nul-terminated string as input. */ - if (count == 0) - count = strlen (bin); - for (i = 0; i < count; i++) { *hex++ = tohex ((*bin >> 4) & 0xf); diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 7bf4a0fbca5..35303dfc05b 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2014-02-12 Tom Tromey + + * remote-utils.c (monitor_output): Pass explicit length to + hexify. + 2014-02-12 Tom Tromey * tracepoint.c: Include rsp-low.h. diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index b83517535d0..8fd7c4a01ec 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -1558,10 +1558,11 @@ relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc) void monitor_output (const char *msg) { - char *buf = xmalloc (strlen (msg) * 2 + 2); + int len = strlen (msg); + char *buf = xmalloc (len * 2 + 2); buf[0] = 'O'; - hexify (buf + 1, msg, 0); + hexify (buf + 1, msg, len); putpkt (buf); free (buf);