Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do more checks on bytecode objects (Bug#21929)

Browse source 
* src/eval.c (funcall_lambda): Check size of compiled function
object.
(Ffetch_bytecode): Likewise.
This commit is contained in:
Andreas Schwab 2015-11-16 23:47:17 +01:00
parent c4b20fc936
commit d443710169
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/eval.c
View file

@ -2792,6 +2792,9 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs,
}
else if (COMPILEDP (fun))
{
ptrdiff_t size = ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK;
if (size <= COMPILED_STACK_DEPTH)
xsignal1 (Qinvalid_function, fun);
syms_left = AREF (fun, COMPILED_ARGLIST);
if (INTEGERP (syms_left))
/* A byte-code object with a non-nil `push args' slot means we
@ -2889,19 +2892,25 @@ DEFUN ("fetch-bytecode", Ffetch_bytecode, Sfetch_bytecode,
{
Lisp_Object tem;
if (COMPILEDP (object) && CONSP (AREF (object, COMPILED_BYTECODE)))
if (COMPILEDP (object))
{
tem = read_doc_string (AREF (object, COMPILED_BYTECODE));
if (!CONSP (tem))
ptrdiff_t size = ASIZE (object) & PSEUDOVECTOR_SIZE_MASK;
if (size <= COMPILED_STACK_DEPTH)
xsignal1 (Qinvalid_function, object);
if (CONSP (AREF (object, COMPILED_BYTECODE)))
{
tem = AREF (object, COMPILED_BYTECODE);
if (CONSP (tem) && STRINGP (XCAR (tem)))
error ("Invalid byte code in %s", SDATA (XCAR (tem)));
else
error ("Invalid byte code");
tem = read_doc_string (AREF (object, COMPILED_BYTECODE));
if (!CONSP (tem))
{
tem = AREF (object, COMPILED_BYTECODE);
if (CONSP (tem) && STRINGP (XCAR (tem)))
error ("Invalid byte code in %s", SDATA (XCAR (tem)));
else
error ("Invalid byte code");
}
ASET (object, COMPILED_BYTECODE, XCAR (tem));
ASET (object, COMPILED_CONSTANTS, XCDR (tem));
}
ASET (object, COMPILED_BYTECODE, XCAR (tem));
ASET (object, COMPILED_CONSTANTS, XCDR (tem));
}
return object;
}