summaryrefslogtreecommitdiff
path: root/src/lisp.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-09-04 14:52:59 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-09-04 14:52:59 -0700
commit86633eab8a77697f6e15aae568868781a5a1023f (patch)
tree22039ff17f96363d7115a8e02c0884010ba75744 /src/lisp.h
parent53e9fe90811730f68c4ea246cd8dee8aa22486de (diff)
parent6511acf2570df26e93e15283d593b8e81d217a78 (diff)
downloademacs-86633eab8a77697f6e15aae568868781a5a1023f.tar.gz
emacs-86633eab8a77697f6e15aae568868781a5a1023f.tar.bz2
emacs-86633eab8a77697f6e15aae568868781a5a1023f.zip
sprintf-related integer and memory overflow issues
Fixes: debbugs:9397 debbugs:9412
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 99555118047..5c84bb8e06e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2895,6 +2895,14 @@ extern void syms_of_print (void);
/* Defined in doprnt.c */
extern ptrdiff_t doprnt (char *, ptrdiff_t, const char *, const char *,
va_list);
+extern ptrdiff_t esprintf (char *, char const *, ...)
+ ATTRIBUTE_FORMAT_PRINTF (2, 3);
+extern ptrdiff_t exprintf (char **, ptrdiff_t *, char const *, ptrdiff_t,
+ char const *, ...)
+ ATTRIBUTE_FORMAT_PRINTF (5, 6);
+extern ptrdiff_t evxprintf (char **, ptrdiff_t *, char const *, ptrdiff_t,
+ char const *, va_list)
+ ATTRIBUTE_FORMAT_PRINTF (5, 0);
/* Defined in lread.c. */
extern Lisp_Object Qvariable_documentation, Qstandard_input;
@@ -3186,7 +3194,7 @@ EXFUN (Fread_minibuffer, 2);
EXFUN (Feval_minibuffer, 2);
EXFUN (Fread_string, 5);
EXFUN (Fassoc_string, 3);
-extern Lisp_Object get_minibuffer (int);
+extern Lisp_Object get_minibuffer (EMACS_INT);
extern void init_minibuf_once (void);
extern void syms_of_minibuf (void);
@@ -3250,7 +3258,7 @@ extern void force_auto_save_soon (void);
extern void init_keyboard (void);
extern void syms_of_keyboard (void);
extern void keys_of_keyboard (void);
-extern char *push_key_description (unsigned int, char *, int);
+extern char *push_key_description (EMACS_INT, char *, int);
/* Defined in indent.c */