From: Juanma Barranquero <lekktu@gmail.com>
Date: Sun, 26 Sep 2010 01:39:24 +0000 (+0200)
Subject: src/w32.c (get_emacs_configuration_options): Fix previous change.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~42^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83e245c4906513429cb56629485deb5f04a240a3;p=emacs.git

src/w32.c (get_emacs_configuration_options): Fix previous change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 29071a36b0e..d43853e7baa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-26  Juanma Barranquero  <lekktu@gmail.com>
+
+	* w32.c (get_emacs_configuration_options): Fix previous change.
+
 2010-09-25  Chong Yidong  <cyd@stupidchicken.com>
 
 	* insdel.c (prepare_to_modify_buffer): Ensure the mark marker is
diff --git a/src/w32.c b/src/w32.c
index 4024ed9512e..ed13c3541cc 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1956,8 +1956,9 @@ get_emacs_configuration_options (void)
 #endif
 #endif
 
-  if (_snprintf (cv, sizeof (cv), COMPILER_VERSION) < 0)
+  if (_snprintf (cv, sizeof (cv) - 1, COMPILER_VERSION) < 0)
     return "Error: not enough space for compiler version";
+  cv[sizeof (cv) - 1] = '\0';
 
   for (i = 0; options[i]; i++)
     size += strlen (options[i]);