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

Fix module_format_fun_env when dynlib_addr fails

Browse source 
* src/emacs-module.c (module_format_fun_env):
exprintf doesn’t support %p, so use %x.  Reported by Eli Zaretskii in:
http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02122.html
This commit is contained in:
Paul Eggert 2015-11-24 23:43:43 -08:00
parent 36311ec8d1
commit d8143fa89b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/emacs-module.c
View file

@ -1035,15 +1035,15 @@ module_format_fun_env (const struct module_fun_env *env)
{
/* Try to print a function name if possible. */
const char *path, *sym;
char buffer[256];
static char const noaddr_format[] = "#<module function at %p>";
char buffer[sizeof noaddr_format + INT_STRLEN_BOUND (intptr_t) + 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));
: sprintf (buffer, noaddr_format, env->subr));
Lisp_Object unibyte_result = make_unibyte_string (buffer, size);
if (buf != buffer)
xfree (buf);