diff options
| author | Tom Tromey <tromey@redhat.com> | 2014-01-18 14:42:54 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-02-12 09:59:15 -0700 |
| commit | 9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763 (patch) | |
| tree | 361786ccaba5933381119910e146b7482857b06f /gdb/tracepoint.c | |
| parent | 9c3d65319a230a106392e4b67c8c89c8f5e2929f (diff) | |
| download | gdb-9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763.zip gdb-9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763.tar.gz gdb-9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763.tar.bz2 | |
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 <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)
(remote_set_trace_notes): Update.
* tracepoint.c (encode_source_string, tfile_write_status)
(tfile_write_uploaded_tsv): Update.
Diffstat (limited to 'gdb/tracepoint.c')
| -rw-r--r-- | gdb/tracepoint.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index b013d88..80d0620 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", |