APPROVE COMMIT NOTE: This patch has been committed. If any package code actually modifies #$, it is incorrect and needs to be fixed, and I have time to do that right now. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1234282051 0 # Node ID 1e3cf11fa27dfd4bef80a31d356e914a3a7dc119 # Parent 517f6887fbc0255ca386afb68f87444f7e93840e Make #$ truly read-only for Lisp; check this in the test suite. lisp/ChangeLog addition: 2009-02-10 Aidan Kehoe <kehoea(a)parhasard.net&gt; * automated/lisp-tests.el : Check that #$ is not modifiable from Lisp, and that load-file-name is modifiable from Lisp. src/ChangeLog addition: 2009-02-10 Aidan Kehoe <kehoea(a)parhasard.net&gt; * lread.c (Fload_internal): Make load-file-name-internal readonly for Lisp code; make load-file-name a modifiable copy. (init_lread): Initialised Vload_file_name_internal, Vload_file_name to nil on each post-dump start. diff -r 517f6887fbc0 -r 1e3cf11fa27d src/ChangeLog --- a/src/ChangeLog Sun Feb 08 18:45:22 2009 +0000 +++ b/src/ChangeLog Tue Feb 10 16:07:31 2009 +0000 ＠＠ -1,3 +1,12 ＠＠ +2009-02-10 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * lread.c (Fload_internal): + Make load-file-name-internal readonly for Lisp code; make + load-file-name a modifiable copy. + (init_lread): + Initialised Vload_file_name_internal, Vload_file_name to nil on + each post-dump start. + 2009-02-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * frame-x.c (x_init_frame_2): Update comment per new info from HT. diff -r 517f6887fbc0 -r 1e3cf11fa27d src/lread.c --- a/src/lread.c Sun Feb 08 18:45:22 2009 +0000 +++ b/src/lread.c Tue Feb 10 16:07:31 2009 +0000 ＠＠ -711,6 +711,8 ＠＠ PRINT_LOADING_MESSAGE (""); + LISP_READONLY (found) = 1; + { /* Lisp_Object's must be malloc'ed, not stack-allocated */ Lisp_Object lispstream = Qnil; ＠＠ -738,7 +740,8 ＠＠ record_unwind_protect (load_force_doc_string_unwind, Vload_force_doc_string_list); Vload_force_doc_string_list = Qnil; - internal_bind_lisp_object (&Vload_file_name, found); + /* load-file-name is not read-only to Lisp. */ + internal_bind_lisp_object (&Vload_file_name, Fcopy_sequence(found)); #ifdef I18N3 /* set it to nil; a call to #'domain will set it. */ internal_bind_lisp_object (&Vfile_domain, Qnil); ＠＠ -3266,6 +3269,9 ＠＠ Vread_buffer_stream = make_resizing_buffer_output_stream (); Vload_force_doc_string_list = Qnil; + + Vload_file_name_internal = Qnil; + Vload_file_name = Qnil; } void diff -r 517f6887fbc0 -r 1e3cf11fa27d tests/ChangeLog --- a/tests/ChangeLog Sun Feb 08 18:45:22 2009 +0000 +++ b/tests/ChangeLog Tue Feb 10 16:07:31 2009 +0000 ＠＠ -1,3 +1,9 ＠＠ +2009-02-10 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * automated/lisp-tests.el : + Check that #$ is not modifiable from Lisp, and that load-file-name + is modifiable from Lisp. + 2009-02-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; * automated/query-coding-tests.el: diff -r 517f6887fbc0 -r 1e3cf11fa27d tests/automated/lisp-tests.el --- a/tests/automated/lisp-tests.el Sun Feb 08 18:45:22 2009 +0000 +++ b/tests/automated/lisp-tests.el Tue Feb 10 16:07:31 2009 +0000 ＠＠ -1334,3 +1334,39 ＠＠ (prin1-to-string char-table-with-symbol))) "Check that char table elements are quoted correctly when printing")) + +(let ((test-file-name + (make-temp-file (expand-file-name "sR4KDwU" (temp-directory)) + nil ".el"))) + (find-file test-file-name) + (erase-buffer) + (insert + "\ +;; Lisp should not be able to modify #$, which is +;; Vload_file_name_internal of lread.c. +(Check-Error setting-constant (aset #$ 0 ?\\ )) + +;; But modifying load-file-name should work: +(let ((new-char ?\\ ) + old-char) + (setq old-char (aref load-file-name 0)) + (if (= new-char old-char) + (setq new-char ?/)) + (aset load-file-name 0 new-char) + (Assert (= new-char (aref load-file-name 0)) + \"Check that we can modify the string value of load-file-name\")) + +(let* ((new-load-file-name \"hi there\") + (load-file-name new-load-file-name)) + (Assert (eq new-load-file-name load-file-name) + \"Checking that we can bind load-file-name successfully.\")) + +") + (write-region (point-min) (point-max) test-file-name nil 'quiet) + (set-buffer-modified-p nil) + (kill-buffer nil) + (load test-file-name nil t nil) + (delete-file test-file-name)) + + + -- ¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir precipitadamente de la aldea por culpa de la escasez de rinocerontes? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches