diff options
| author | Tom Tromey <tromey@redhat.com> | 2014-01-18 19:25:57 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-02-12 09:59:16 -0700 |
| commit | 0a822afbcdf6aee6c25a840e4785ad3af56a94fd (patch) | |
| tree | 169393d7a5cc2a03aafa5c26ea3e4239c00a9386 | |
| parent | 9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763 (diff) | |
| download | gdb-0a822afbcdf6aee6c25a840e4785ad3af56a94fd.zip gdb-0a822afbcdf6aee6c25a840e4785ad3af56a94fd.tar.gz gdb-0a822afbcdf6aee6c25a840e4785ad3af56a94fd.tar.bz2 | |
don't let hexify call strlen
hexify had the same issue as bin2hex; and the fix is the same.
2014-02-12 Tom Tromey <tromey@redhat.com>
* common/rsp-low.c (hexify): Never take strlen of argument.
2014-02-12 Tom Tromey <tromey@redhat.com>
* remote-utils.c (monitor_output): Pass explicit length to
hexify.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/common/rsp-low.c | 4 | ||||
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/remote-utils.c | 5 |
4 files changed, 12 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e1dfbbb..e8521c9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2014-02-12 Tom Tromey <tromey@redhat.com> + * common/rsp-low.c (hexify): Never take strlen of argument. + +2014-02-12 Tom Tromey <tromey@redhat.com> + * common/rsp-low.c (bin2hex): Never take strlen of argument. * remote.c (extended_remote_run, remote_rcmd) (remote_download_trace_state_variable, remote_save_trace_data) diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c index 7f0445c..fd6f563 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 7bf4a0f..35303df 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2014-02-12 Tom Tromey <tromey@redhat.com> + * remote-utils.c (monitor_output): Pass explicit length to + hexify. + +2014-02-12 Tom Tromey <tromey@redhat.com> + * tracepoint.c: Include rsp-low.h. * server.c: Include rsp-low.h. * remote-utils.h (convert_ascii_to_int, convert_int_to_ascii) diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index b835175..8fd7c4a 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); |