From: Daniel Jacobowitz <drow@false.org>
Date: Wed, 4 Dec 2002 04:53:13 +0000 (+0000)
Subject: 	* breakpoint.c (create_thread_event_breakpoint): Use xasprintf.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8ef46f5faa8a4d71f626d08a6a28359435bce6b;p=binutils-gdb.git

	* breakpoint.c (create_thread_event_breakpoint): Use xasprintf.
	(create_breakpoints): Make sure the addr_string field is not
	NULL.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 12d6a0f76ba..01296116041 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-03  H.J. Lu  (hjl@gnu.org)
+
+	* breakpoint.c (create_thread_event_breakpoint): Use xasprintf.
+	(create_breakpoints): Make sure the addr_string field is not
+	NULL.
+
 2002-12-03  Andrew Cagney  <ac131313@redhat.com>
 
 	* sparc-nat.c (fetch_inferior_registers)
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 7418c414843..cf3da5edae3 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4010,14 +4010,12 @@ struct breakpoint *
 create_thread_event_breakpoint (CORE_ADDR address)
 {
   struct breakpoint *b;
-  char addr_string[80];		/* Surely an addr can't be longer than that. */
 
   b = create_internal_breakpoint (address, bp_thread_event);
   
   b->enable_state = bp_enabled;
   /* addr_string has to be used or breakpoint_re_set will delete me.  */
-  sprintf (addr_string, "*0x%s", paddr (b->address));
-  b->addr_string = xstrdup (addr_string);
+  xasprintf (&b->addr_string, "*0x%s", paddr (b->address));
 
   return b;
 }
@@ -4573,7 +4571,12 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string,
 	b->number = breakpoint_count;
 	b->cond = cond[i];
 	b->thread = thread;
-	b->addr_string = addr_string[i];
+	if (addr_string[i])
+	  b->addr_string = addr_string[i];
+	else
+	  /* addr_string has to be used or breakpoint_re_set will delete
+	     me.  */
+	  xasprintf (&b->addr_string, "*0x%s", paddr (b->address));
 	b->cond_string = cond_string[i];
 	b->ignore_count = ignore_count;
 	b->enable_state = bp_enabled;