Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Tom Tromey <tromey@redhat.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@redhat.com>
Subject: [RFC 4/9] don't let hexify call strlen
Date: Mon, 20 Jan 2014 19:23:00 -0000	[thread overview]
Message-ID: <1390245501-1186-5-git-send-email-tromey@redhat.com> (raw)
In-Reply-To: <1390245501-1186-1-git-send-email-tromey@redhat.com>

hexify had the same issue as bin2hex; and the fix is the same.

2014-01-20  Tom Tromey  <tromey@redhat.com>

	* common/rsp-low.c (hexify): Never take strlen of argument.

2014-01-20  Tom Tromey  <tromey@redhat.com>

	* remote-utils.c (monitor_output): Pass explicit length to
	hexify.
---
 gdb/ChangeLog                | 4 ++++
 gdb/common/rsp-low.c         | 4 ----
 gdb/gdbserver/ChangeLog      | 5 +++++
 gdb/gdbserver/remote-utils.c | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c
index 9c5119b..feb6d0c 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/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 710d398..b2a84c3 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);
-- 
1.8.1.4


  parent reply	other threads:[~2014-01-20 19:23 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-20 19:18 [RFC 0/9] move more code into common/ Tom Tromey
2014-01-20 19:18 ` [RFC 3/9] don't let bin2hex call strlen Tom Tromey
2014-02-05 20:36   ` Pedro Alves
2014-01-20 19:18 ` [RFC 1/9] share "cell" code Tom Tromey
2014-02-05 20:05   ` Pedro Alves
2014-02-05 20:13     ` Tom Tromey
2014-02-06  2:28       ` Yao Qi
2014-02-06 18:51         ` Tom Tromey
2014-01-20 19:18 ` [RFC 2/9] move some rsp bits into rsp-low.h Tom Tromey
2014-01-21  3:24   ` Yao Qi
2014-02-05 20:33   ` Pedro Alves
2014-02-06 18:56     ` Tom Tromey
2014-02-06 19:08       ` Pedro Alves
2014-01-20 19:18 ` [RFC 6/9] replace convert_int_to_ascii with bin2hex Tom Tromey
2014-02-05 20:39   ` Pedro Alves
2014-01-20 19:23 ` [RFC 9/9] update rsp-low comments Tom Tromey
2014-02-05 22:22   ` Pedro Alves
2014-01-20 19:23 ` [RFC 5/9] replace hexify with bin2hex Tom Tromey
2014-02-05 20:38   ` Pedro Alves
2014-01-20 19:23 ` Tom Tromey [this message]
2014-02-05 20:37   ` [RFC 4/9] don't let hexify call strlen Pedro Alves
2014-01-20 19:23 ` [RFC 8/9] replace convert_ascii_to_int with hex2bin Tom Tromey
2014-02-05 22:18   ` Pedro Alves
2014-01-20 19:38 ` [RFC 7/9] replace unhexify " Tom Tromey
2014-02-05 22:14   ` Pedro Alves

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1390245501-1186-5-git-send-email-tromey@redhat.com \
    --to=tromey@redhat.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox