diff --git a/gdbsupport/print-utils.cc b/gdbsupport/print-utils.cc
index a798713b248..8514720d963 100644
--- a/gdbsupport/print-utils.cc
+++ b/gdbsupport/print-utils.cc
@@ -304,8 +304,7 @@ core_addr_to_string (const CORE_ADDR addr)
 {
   char *str = get_print_cell ();
 
-  strcpy (str, "0x");
-  strcat (str, phex (addr));
+  xsnprintf (str, PRINT_CELL_SIZE, "0x%s", phex (addr));
   return str;
 }
 
@@ -316,8 +315,7 @@ core_addr_to_string_nz (const CORE_ADDR addr)
 {
   char *str = get_print_cell ();
 
-  strcpy (str, "0x");
-  strcat (str, phex_nz (addr));
+  xsnprintf (str, PRINT_CELL_SIZE, "0x%s", phex_nz (addr));
   return str;
 }