diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ac916def8bc..c12de3a0285 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* utils.c (make_hex_string): Replace use of sprintf by use of
+	xsnprintf.
+
 2014-12-13  Joel Brobecker  <brobecker@adacore.com>
 
 	* compile/compile-object-load.c (link_callbacks_multiple_definition)
diff --git a/gdb/utils.c b/gdb/utils.c
index 1ab183c2ce7..ea2b18a801e 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1124,7 +1124,7 @@ make_hex_string (const gdb_byte *data, size_t length)
 
   p = result;
   for (i = 0; i < length; ++i)
-    p += sprintf (p, "%02x", data[i]);
+    p += xsnprintf (p, 2, "%02x", data[i]);
   *p = '\0';
   return result;
 }