diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 66fe9c9f28..ddd93f246b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-20  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* cli-out.c (cli_ui_out::do_field_int): Use string_printf rather
+	than a fixed size buffer.
+
 2018-11-20  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* breakpoint.c (print_one_breakpoint_location): Reduce whitespace,
diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 9ffd6f0157..7e3ee3e54c 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -94,14 +94,12 @@ void
 cli_ui_out::do_field_int (int fldno, int width, ui_align alignment,
 			  const char *fldname, int value)
 {
-  char buffer[20];	/* FIXME: how many chars long a %d can become? */
-
   if (m_suppress_output)
     return;
 
-  xsnprintf (buffer, sizeof (buffer), "%d", value);
+  std::string str = string_printf ("%d", value);
 
-  do_field_string (fldno, width, alignment, fldname, buffer);
+  do_field_string (fldno, width, alignment, fldname, str.c_str ());
 }
 
 /* used to omit a field */