From 9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 18 Jan 2014 14:42:54 -0700 Subject: [PATCH] don't let bin2hex call strlen Currently bin2hex may call strlen if the length argument is zero. This prevents some function unification; and also it seems cleaner to me not to have a special meaning for a zero length. 2014-02-12 Tom Tromey * 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) (remote_set_trace_notes): Update. * tracepoint.c (encode_source_string, tfile_write_status) (tfile_write_uploaded_tsv): Update. --- gdb/ChangeLog | 9 +++++++++ gdb/common/rsp-low.c | 4 ---- gdb/remote.c | 18 ++++++++++-------- gdb/tracepoint.c | 10 +++++----- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 034e4881c78..e1dfbbb6239 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2014-02-12 Tom Tromey + + * 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) + (remote_set_trace_notes): Update. + * tracepoint.c (encode_source_string, tfile_write_status) + (tfile_write_uploaded_tsv): Update. + 2014-02-12 Tom Tromey * tracepoint.c: Include rsp-low.h. diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c index 07e7ddb4bda..7f0445cb250 100644 --- a/gdb/common/rsp-low.c +++ b/gdb/common/rsp-low.c @@ -163,10 +163,6 @@ bin2hex (const gdb_byte *bin, char *hex, int count) { int i; - /* May use a length, or a nul-terminated string as input. */ - if (count == 0) - count = strlen ((char *) bin); - for (i = 0; i < count; i++) { *hex++ = tohex ((*bin >> 4) & 0xf); diff --git a/gdb/remote.c b/gdb/remote.c index eaaeb74a39d..4a467402556 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -7868,7 +7868,8 @@ extended_remote_run (char *args) if (strlen (remote_exec_file) * 2 + len >= get_remote_packet_size ()) error (_("Remote file name too long for run packet")); - len += 2 * bin2hex ((gdb_byte *) remote_exec_file, rs->buf + len, 0); + len += 2 * bin2hex ((gdb_byte *) remote_exec_file, rs->buf + len, + strlen (remote_exec_file)); gdb_assert (args != NULL); if (*args) @@ -7884,7 +7885,8 @@ extended_remote_run (char *args) if (strlen (argv[i]) * 2 + 1 + len >= get_remote_packet_size ()) error (_("Argument list too long for run packet")); rs->buf[len++] = ';'; - len += 2 * bin2hex ((gdb_byte *) argv[i], rs->buf + len, 0); + len += 2 * bin2hex ((gdb_byte *) argv[i], rs->buf + len, + strlen (argv[i])); } do_cleanups (back_to); } @@ -8974,7 +8976,7 @@ remote_rcmd (char *command, error (_("\"monitor\" command ``%s'' is too long."), command); /* Encode the actual command. */ - bin2hex ((gdb_byte *) command, p, 0); + bin2hex ((gdb_byte *) command, p, strlen (command)); if (putpkt (rs->buf) < 0) error (_("Communication problem with target.")); @@ -10591,7 +10593,7 @@ remote_download_trace_state_variable (struct trace_state_variable *tsv) p = rs->buf + strlen (rs->buf); if ((p - rs->buf) + strlen (tsv->name) * 2 >= get_remote_packet_size ()) error (_("Trace state variable name too long for tsv definition packet")); - p += 2 * bin2hex ((gdb_byte *) (tsv->name), p, 0); + p += 2 * bin2hex ((gdb_byte *) (tsv->name), p, strlen (tsv->name)); *p++ = '\0'; putpkt (rs->buf); remote_get_noisy_reply (&target_buf, &target_buf_size); @@ -10921,7 +10923,7 @@ remote_save_trace_data (const char *filename) p += strlen (p); if ((p - rs->buf) + strlen (filename) * 2 >= get_remote_packet_size ()) error (_("Remote file name too long for trace save packet")); - p += 2 * bin2hex ((gdb_byte *) filename, p, 0); + p += 2 * bin2hex ((gdb_byte *) filename, p, strlen (filename)); *p++ = '\0'; putpkt (rs->buf); reply = remote_get_noisy_reply (&target_buf, &target_buf_size); @@ -11126,21 +11128,21 @@ remote_set_trace_notes (const char *user, const char *notes, if (user) { buf += xsnprintf (buf, endbuf - buf, "user:"); - nbytes = bin2hex ((gdb_byte *) user, buf, 0); + nbytes = bin2hex ((gdb_byte *) user, buf, strlen (user)); buf += 2 * nbytes; *buf++ = ';'; } if (notes) { buf += xsnprintf (buf, endbuf - buf, "notes:"); - nbytes = bin2hex ((gdb_byte *) notes, buf, 0); + nbytes = bin2hex ((gdb_byte *) notes, buf, strlen (notes)); buf += 2 * nbytes; *buf++ = ';'; } if (stop_notes) { buf += xsnprintf (buf, endbuf - buf, "tstop:"); - nbytes = bin2hex ((gdb_byte *) stop_notes, buf, 0); + nbytes = bin2hex ((gdb_byte *) stop_notes, buf, strlen (stop_notes)); buf += 2 * nbytes; *buf++ = ';'; } diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index b013d88ecb1..80d0620a6af 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -3092,7 +3092,7 @@ encode_source_string (int tpnum, ULONGEST addr, srctype, 0, (int) strlen (src)); if (strlen (buf) + strlen (src) * 2 >= buf_size) error (_("Source string too long for buffer")); - bin2hex ((gdb_byte *) src, buf + strlen (buf), 0); + bin2hex ((gdb_byte *) src, buf + strlen (buf), strlen (src)); return -1; } @@ -3211,7 +3211,7 @@ tfile_write_status (struct trace_file_writer *self, { char *buf = (char *) alloca (strlen (ts->stop_desc) * 2 + 1); - bin2hex ((gdb_byte *) ts->stop_desc, buf, 0); + bin2hex ((gdb_byte *) ts->stop_desc, buf, strlen (ts->stop_desc)); fprintf (writer->fp, ":%s", buf); } fprintf (writer->fp, ":%x", ts->stopping_tracepoint); @@ -3241,14 +3241,14 @@ tfile_write_status (struct trace_file_writer *self, { char *buf = (char *) alloca (strlen (ts->notes) * 2 + 1); - bin2hex ((gdb_byte *) ts->notes, buf, 0); + bin2hex ((gdb_byte *) ts->notes, buf, strlen (ts->notes)); fprintf (writer->fp, ";notes:%s", buf); } if (ts->user_name != NULL) { char *buf = (char *) alloca (strlen (ts->user_name) * 2 + 1); - bin2hex ((gdb_byte *) ts->user_name, buf, 0); + bin2hex ((gdb_byte *) ts->user_name, buf, strlen (ts->user_name)); fprintf (writer->fp, ";username:%s", buf); } fprintf (writer->fp, "\n"); @@ -3268,7 +3268,7 @@ tfile_write_uploaded_tsv (struct trace_file_writer *self, if (utsv->name) { buf = (char *) xmalloc (strlen (utsv->name) * 2 + 1); - bin2hex ((gdb_byte *) (utsv->name), buf, 0); + bin2hex ((gdb_byte *) (utsv->name), buf, strlen (utsv->name)); } fprintf (writer->fp, "tsv %x:%s:%x:%s\n", -- 2.30.2