emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 63e59c8: Avoid crashes in malformed defvar


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-26 63e59c8: Avoid crashes in malformed defvar
Date: Tue, 28 Aug 2018 03:21:29 -0400 (EDT)

branch: emacs-26
commit 63e59c8ca51ced6c4d5951281cb21288da32ced3
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Avoid crashes in malformed defvar
    
    * src/eval.c (Fdefvar): Don't call XSYMBOL on something that
    might not be a symbol.  This avoids crashes due to malformed
    'defvar' forms.  (Bug#32552)
---
 src/eval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eval.c b/src/eval.c
index 40cba3b..f9563a3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -773,7 +773,7 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
       LOADHIST_ATTACH (sym);
     }
   else if (!NILP (Vinternal_interpreter_environment)
-          && !XSYMBOL (sym)->u.s.declared_special)
+          && (SYMBOLP (sym) && !XSYMBOL (sym)->u.s.declared_special))
     /* A simple (defvar foo) with lexical scoping does "nothing" except
        declare that var to be dynamically scoped *locally* (i.e. within
        the current file or let-block).  */



reply via email to

[Prev in Thread] Current Thread [Next in Thread]