From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 29 Aug 2011 15:51:23 +0000 (-0700)
Subject: * dispnew.c (add_window_display_history): Don't overrun buffer.
X-Git-Tag: emacs-pretest-24.0.90~104^2~153^2~1^2~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d1df220c5484374901f8edff05e41bb575c0c77;p=emacs.git

* dispnew.c (add_window_display_history): Don't overrun buffer.

Truncate instead; this is OK since it's just a log.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 307174268bc..4336d6a6b83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -23,6 +23,9 @@
 	* dbusbind.c (xd_signature, Fdbus_register_signal):
 	Do not overrun buffer; instead, report string overflow.
 
+	* dispnew.c (add_window_display_history): Don't overrun buffer.
+	Truncate instead; this is OK since it's just a log.
+
 2011-08-26  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Integer and memory overflow issues (Bug#9196).
diff --git a/src/dispnew.c b/src/dispnew.c
index e96583e0025..0cc888b4b7a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -272,15 +272,16 @@ add_window_display_history (struct window *w, const char *msg, int paused_p)
   buf = redisplay_history[history_idx].trace;
   ++history_idx;
 
-  sprintf (buf, "%"pMu": window %p (`%s')%s\n",
-	   history_tick++,
-	   w,
-	   ((BUFFERP (w->buffer)
-	     && STRINGP (BVAR (XBUFFER (w->buffer), name)))
-	    ? SSDATA (BVAR (XBUFFER (w->buffer), name))
-	    : "???"),
-	   paused_p ? " ***paused***" : "");
-  strcat (buf, msg);
+  esnprintf (buf, sizeof redisplay_history[0].trace,
+	     "%"pMu": window %p (`%s')%s\n%s",
+	     history_tick++,
+	     w,
+	     ((BUFFERP (w->buffer)
+	       && STRINGP (BVAR (XBUFFER (w->buffer), name)))
+	      ? SSDATA (BVAR (XBUFFER (w->buffer), name))
+	      : "???"),
+	     paused_p ? " ***paused***" : "",
+	     msg);
 }