changeset 110582:aa7656773a38

src/w32.c (get_emacs_configuration_options): Fix previous change.
author Juanma Barranquero <lekktu@gmail.com>
date Sun, 26 Sep 2010 03:39:24 +0200
parents f215ea324ebd
children b6d2a63ad993
files src/ChangeLog src/w32.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Sep 25 14:57:02 2010 -0700
+++ b/src/ChangeLog	Sun Sep 26 03:39:24 2010 +0200
@@ -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
--- a/src/w32.c	Sat Sep 25 14:57:02 2010 -0700
+++ b/src/w32.c	Sun Sep 26 03:39:24 2010 +0200
@@ -1956,8 +1956,9 @@
 #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]);