diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-06-04 10:33:07 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-06-04 10:33:07 +0100 |
| commit | f5ea65b43678621cb450d7afbcd46032258d4b20 (patch) | |
| tree | dcc643ae66589a1690c50895a46e8004c981ead0 /src/lread.c | |
| parent | e4e6bb7fddaa3a4e82748c106366fe9113dc16d9 (diff) | |
| parent | 4fff6502368e87b3c031589a1a96267243f868b0 (diff) | |
| download | emacs-f5ea65b43678621cb450d7afbcd46032258d4b20.tar.gz emacs-f5ea65b43678621cb450d7afbcd46032258d4b20.tar.bz2 emacs-f5ea65b43678621cb450d7afbcd46032258d4b20.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/lread.c b/src/lread.c index 9f849eda423..026f3b6d98f 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3030,17 +3030,18 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list) struct Lisp_Vector *vec; tmp = read_vector (readcharfun, 1); vec = XVECTOR (tmp); - if (! (COMPILED_STACK_DEPTH < vec->header.size - && (FIXNUMP (vec->contents[COMPILED_ARGLIST]) - || CONSP (vec->contents[COMPILED_ARGLIST]) - || NILP (vec->contents[COMPILED_ARGLIST])) - && ((STRINGP (vec->contents[COMPILED_BYTECODE]) - && VECTORP (vec->contents[COMPILED_CONSTANTS])) - || CONSP (vec->contents[COMPILED_BYTECODE])) - && FIXNATP (vec->contents[COMPILED_STACK_DEPTH]))) + if (! (COMPILED_STACK_DEPTH < ASIZE (tmp) + && (FIXNUMP (AREF (tmp, COMPILED_ARGLIST)) + || CONSP (AREF (tmp, COMPILED_ARGLIST)) + || NILP (AREF (tmp, COMPILED_ARGLIST))) + && ((STRINGP (AREF (tmp, COMPILED_BYTECODE)) + && VECTORP (AREF (tmp, COMPILED_CONSTANTS))) + || CONSP (AREF (tmp, COMPILED_BYTECODE))) + && FIXNATP (AREF (tmp, COMPILED_STACK_DEPTH)))) invalid_syntax ("Invalid byte-code object"); - if (STRING_MULTIBYTE (AREF (tmp, COMPILED_BYTECODE))) + if (STRINGP (AREF (tmp, COMPILED_BYTECODE)) + && STRING_MULTIBYTE (AREF (tmp, COMPILED_BYTECODE))) { /* BYTESTR must have been produced by Emacs 20.2 or earlier because it produced a raw 8-bit string for byte-code and @@ -3051,7 +3052,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list) Fstring_as_unibyte (AREF (tmp, COMPILED_BYTECODE))); } - if (COMPILED_DOC_STRING < vec->header.size + if (COMPILED_DOC_STRING < ASIZE (tmp) && EQ (AREF (tmp, COMPILED_DOC_STRING), make_fixnum (0))) { /* read_list found a docstring like '(#$ . 5521)' and treated it |