mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

src/w32.c (get_emacs_configuration_options): Fix buffer overrun.

Browse source
This commit is contained in:
Juanma Barranquero 2010-09-22 19:31:21 +02:00
parent 8f978ca0d5
commit 38c54d9dab
2 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-09-22 Juanma Barranquero <lekktu@gmail.com>
Eli Zaretskii <eliz@gnu.org>
* w32.c (get_emacs_configuration_options): Fix buffer overrun.
2010-09-22 Eli Zaretskii <eliz@gnu.org>
* minibuf.c (Fminibuffer_contents)

43
src/w32.c
View file

@ -1925,7 +1925,25 @@ get_emacs_configuration (void)
char *
get_emacs_configuration_options (void)
{
static char options_buffer[256];
static char *options_buffer;
char cv[32]; /* Enough for COMPILER_VERSION. */
char *options[] = {
cv, /* To be filled later. */
#ifdef EMACSDEBUG
" --no-opt",
#endif
/* configure.bat already sets USER_CFLAGS and USER_LDFLAGS
with a starting space to save work here. */
#ifdef USER_CFLAGS
" --cflags", USER_CFLAGS,
#endif
#ifdef USER_LDFLAGS
" --ldflags", USER_LDFLAGS,
#endif
NULL
};
size_t size = 0;
int i;
/* Work out the effective configure options for this build. */
#ifdef _MSC_VER
@ -1938,18 +1956,17 @@ get_emacs_configuration_options (void)
#endif
#endif
sprintf (options_buffer, COMPILER_VERSION);
#ifdef EMACSDEBUG
strcat (options_buffer, " --no-opt");
#endif
#ifdef USER_CFLAGS
strcat (options_buffer, " --cflags");
strcat (options_buffer, USER_CFLAGS);
#endif
#ifdef USER_LDFLAGS
strcat (options_buffer, " --ldflags");
strcat (options_buffer, USER_LDFLAGS);
#endif
if (_snprintf (cv, sizeof (cv), COMPILER_VERSION) < 0)
return "Error: not enough space for compiler version";
for (i = 0; options[i]; i++)
size += strlen (options[i]);
options_buffer = xmalloc (size + 1);
for (i = 0; options[i]; i++)
strcat (options_buffer, options[i]);
return options_buffer;
}