procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

module_format_fun_env fixes

Browse source 
* src/doprnt.c (exprintf) [HAVE_MODULES]: Also define in this case.
* src/emacs-module.c (module_format_fun_env):
Convert path and sym to UTF-8.
Don’t use VLAs, as the C11 standard says they’re optional,
and anyway they can cause core dumps with large allocations.
Use exprintf rather than snprintf, as exprintf handles arbitrarily
long strings.  Simplify the code a bit.
This commit is contained in:
Paul Eggert 2015-11-23 15:45:29 -08:00
parent 58dfc16cd0
commit 4f10c3cdef
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doprnt.c
View file

@ -500,7 +500,7 @@ esprintf (char *buf, char const *format, ...)
return nbytes;
}
#if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
#if HAVE_MODULES || (defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT)
/* Format to buffer *BUF of positive size *BUFSIZE, reallocating *BUF
and updating *BUFSIZE if the buffer is too small, and otherwise

32
src/emacs-module.c
View file

@ -1039,25 +1039,19 @@ module_format_fun_env (const struct module_fun_env *env)
{
/* Try to print a function name if possible. */
const char *path, *sym;
if (dynlib_addr (env->subr, &path, &sym))
{
static char const format[] = "#<module function %s from %s>";
int size = snprintf (NULL, 0, format, sym, path);
eassert (size > 0);
char buffer[size + 1];
snprintf (buffer, sizeof buffer, format, sym, path);
return make_unibyte_string (buffer, size);
}
else
{
static char const format[] = "#<module function at %p>";
void *subr = env->subr;
int size = snprintf (NULL, 0, format, subr);
eassert (size > 0);
char buffer[size + 1];
snprintf (buffer, sizeof buffer, format, subr);
return make_unibyte_string (buffer, size);
}
char buffer[256];
char *buf = buffer;
ptrdiff_t bufsize = sizeof buffer;
ptrdiff_t size
= (dynlib_addr (env->subr, &path, &sym)
? exprintf (&buf, &bufsize, buffer, -1,
"#<module function %s from %s>", sym, path)
: exprintf (&buf, &bufsize, buffer, -1,
"#<module function at %p>", env->subr));
Lisp_Object unibyte_result = make_unibyte_string (buffer, size);
if (buf != buffer)
xfree (buf);
return code_convert_string_norecord (unibyte_result, Qutf_8, false);
}