mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

Fix valgrind report in call-interactively

Browse Source 
* src/callint.c (Fcall_interactively): Don't try to access more
bytes than are available in the interactive spec.  (Bug#30004)
This commit is contained in:
Eli Zaretskii 2018-01-06 18:23:52 +02:00
parent d5f1c87bfe
commit 3a22097cf6
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/callint.c
View File

@ -774,10 +774,23 @@ invoke it. If KEYS is omitted or nil, the return value of
if anyone tries to define one here. */ if anyone tries to define one here. */
case '+': case '+':
default: default:
error ("Invalid control letter `%c' (#o%03o, #x%04x) in interactive calling string", {
STRING_CHAR ((unsigned char *) tem), /* How many bytes are left unprocessed in the specs string?
(unsigned) STRING_CHAR ((unsigned char *) tem), (Note that this excludes the trailing null byte.) */
(unsigned) STRING_CHAR ((unsigned char *) tem)); ptrdiff_t bytes_left = SBYTES (specs) - (tem - string);
unsigned letter;
/* If we have enough bytes left to treat the sequence as a
character, show that character's codepoint; otherwise
show only its first byte. */
if (bytes_left >= BYTES_BY_CHAR_HEAD (*((unsigned char *) tem)))
letter = STRING_CHAR ((unsigned char *) tem);
else
letter = *((unsigned char *) tem);
error ("Invalid control letter `%c' (#o%03o, #x%04x) in interactive calling string",
(int) letter, letter, letter);
}
} }
if (varies[i] == 0) if (varies[i] == 0)