Fix crash in evaluating functions

See Bug#24673

* src/eval.c (funcall_lambda): Fix crash for bogus functions such
as (closure).

* test/src/eval-tests.el (eval-tests--bug24673): Add test.

diff --git a/src/eval.c b/src/eval.c
index 2fedbf377cf8bcfe892733b2d4b701b83712134c..a9bad2491fae6885ef0b0485c10bc05e979038c0 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -2841,9 +2841,11 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs,
     {
       if (EQ (XCAR (fun), Qclosure))
        {
-         fun = XCDR (fun);     /* Drop `closure'.  */
+         Lisp_Object cdr = XCDR (fun); /* Drop `closure'.  */
+         if (! CONSP (cdr))
+           xsignal1 (Qinvalid_function, fun);
+         fun = cdr;
          lexenv = XCAR (fun);
-         CHECK_LIST_CONS (fun, fun);
        }
       else
        lexenv = Qnil;

diff --git a/test/src/eval-tests.el b/test/src/eval-tests.el
new file mode 100644 (file)
index 0000000..75999e1
--- /dev/null
+++ b/test/src/eval-tests.el
@@ -0,0 +1,35 @@
+;;; eval-tests.el --- unit tests for src/eval.c      -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2016 Free Software Foundation, Inc.
+
+;; Author: Philipp Stephani <phst@google.com>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Unit tests for src/eval.c.
+
+;;; Code:
+
+(require 'ert)
+
+(ert-deftest eval-tests--bug24673 ()
+  "Checks that Bug#24673 has been fixed."
+  ;; This should not crash.
+  (should-error (funcall '(closure)) :type 'invalid-function))
+
+;;; eval-tests.el ends here