diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-05-22 12:26:22 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-05-22 12:42:16 -0700 |
| commit | 02f303d75f876517b7802f787413cbb418203315 (patch) | |
| tree | a0a0413cb8928dd09c8a125581e3d4dbbd0cae45 | |
| parent | a51725280ac3f4db3b9a1a552f25fb4204f45a4d (diff) | |
| download | emacs-02f303d75f876517b7802f787413cbb418203315.tar.gz | |
Fix failed assertion when load-force-doc-strings
Problem reported by Philipp Stephani (Bug#31556).
* src/lread.c (read_vector): When load_force_doc_strings, check
for byte code vectors that are invalid because they are too short.
* test/src/lread-tests.el (lread-invalid-bytecodes): New test.
| -rw-r--r-- | src/lread.c | 4 | ||||
| -rw-r--r-- | test/src/lread-tests.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index b8db117c79c..239c66ccb85 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3829,9 +3829,11 @@ read_vector (Lisp_Object readcharfun, bool bytecodeflag) tem = read_list (1, readcharfun); len = Flength (tem); + if (bytecodeflag && XFASTINT (len) <= COMPILED_STACK_DEPTH) + error ("Invalid byte code"); vector = Fmake_vector (len, Qnil); - size = ASIZE (vector); + size = XFASTINT (len); ptr = XVECTOR (vector)->contents; for (i = 0; i < size; i++) { diff --git a/test/src/lread-tests.el b/test/src/lread-tests.el index 647e886d342..639a6da93ae 100644 --- a/test/src/lread-tests.el +++ b/test/src/lread-tests.el @@ -207,4 +207,8 @@ literals (Bug#20852)." ;; bug was fixed. (eval-buffer)))) +(ert-deftest lread-invalid-bytecodes () + (should-error + (let ((load-force-doc-strings t)) (read "#[0 \"\"]")))) + ;;; lread-tests.el ends here |