[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a90d5e6 3/7: Error if --eval arg has text beyond 1
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master a90d5e6 3/7: Error if --eval arg has text beyond 1 expression |
Date: |
Sat, 6 Aug 2016 20:16:33 +0000 (UTC) |
branch: master
commit a90d5e6309c0306d931d398506b242c3eb4f40d7
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Error if --eval arg has text beyond 1 expression
* lisp/startup.el (command-line-1): If --eval argument has more data
than constitutes a single Lisp expression, signal an error (Bug #23159).
---
lisp/startup.el | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lisp/startup.el b/lisp/startup.el
index 761e69e..fcdc376 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2360,7 +2360,14 @@ nil default-directory" name)
((member argi '("-eval" "-execute"))
(setq inhibit-startup-screen t)
- (eval (read (or argval (pop command-line-args-left)))))
+ (let* ((str-expr (or argval (pop command-line-args-left)))
+ (read-data (read-from-string str-expr))
+ (expr (car read-data))
+ (end (cdr read-data)))
+ (unless (= end (length str-expr))
+ (error "Trailing garbage following expression: %s"
+ (substring str-expr end)))
+ (eval expr)))
((member argi '("-L" "-directory"))
;; -L :/foo adds /foo to the _end_ of load-path.
- [Emacs-diffs] master updated (b593ea1 -> 37cef5f), Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 4dec928 2/7: Fix quoted lambda warning from lexical-let, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master a90d5e6 3/7: Error if --eval arg has text beyond 1 expression,
Noam Postavsky <=
- [Emacs-diffs] master ff40055 1/7: Make emerge always use shell-quote-argument, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 031af49 4/7: Fix byte-compile of interactive closures, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 37cef5f 7/7: Make sh-mode always use p-s-lookup-properties, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 9ae89c2 5/7: Don't delete selection after indent-rigidly, Noam Postavsky, 2016/08/06
- [Emacs-diffs] master 0095837 6/7: Fix cl-assert with atomp FORM, non-nil SHOW-ARGS, Noam Postavsky, 2016/08/06