mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

(decode_coding): Avoid nested *-change-functions (bug#78042)

Browse source 
* src/coding.c (decode_coding): Avoid nested *-change-functions (bug#78042).

* test/src/editfns-tests.el (sanity-check-change-functions-before)
(sanity-check-change-functions-after): Record notifications in
`sanity-check-change-functions-op`.
(sanity-check-change-functions-with-op): Don't rely on
`sanity-check-change-functions-op` always holding only the `op`.
(sanity-check-change-functions-errors): Include the sequence of
notifications in the error info.
(editfns-tests--before/after-change-functions): Add tests for (bug#78042).
This commit is contained in:
Stefan Monnier 2025-05-02 16:59:17 -04:00
parent 99ca41b6ef
commit 9048fcf22c
2 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/coding.c
View file

@ -7363,6 +7363,7 @@ decode_coding (struct coding_system *coding)
struct ccl_spec cclspec;
int carryover;
int i;
specpdl_ref count = SPECPDL_INDEX ();
USE_SAFE_ALLOCA;
@ -7389,6 +7390,9 @@ decode_coding (struct coding_system *coding)
undo_list = BVAR (current_buffer, undo_list);
bset_undo_list (current_buffer, Qt);
/* Avoid running nested *-change-functions via 'produce_annotation'.
Our callers run *-change-functions over the whole region anyway. */
specbind (Qinhibit_modification_hooks, Qt);
}
coding->consumed = coding->consumed_char = 0;
@ -7501,7 +7505,7 @@ decode_coding (struct coding_system *coding)
record_insert (coding->dst_pos, coding->produced_char);
}
SAFE_FREE ();
SAFE_FREE_UNBIND_TO (count, Qnil);
}

28
test/src/editfns-tests.el
View file

@ -498,10 +498,10 @@
(defvar sanity-check-change-functions-op nil)
(defmacro sanity-check-change-functions-with-op (op &rest body)
(declare (debug t) (indent 1))
`(let ((sanity-check-change-functions-op ,op))
(sanity-check--message "%S..." sanity-check-change-functions-op)
`(let ((sanity-check-change-functions-op (list ,op)))
(sanity-check--message "%S..." ,op)
,@body
(sanity-check--message "%S...done" sanity-check-change-functions-op)))
(sanity-check--message "%S...done" ,op)))
(defun sanity-check--message (&rest args)
(if sanity-check-change-functions-verbose (apply #'message args)))
@ -530,6 +530,7 @@
(setq sanity-check-change-functions-buffer-size (buffer-size)))))
(defun sanity-check-change-functions-before (beg end)
(push `(BEFORE ,beg ,end) sanity-check-change-functions-op)
(sanity-check--message "Before: %S %S" beg end)
(unless (<= (point-min) beg end (point-max))
(sanity-check-change-functions-error
@ -540,6 +541,7 @@
(setq sanity-check-change-functions-end end))
(defun sanity-check-change-functions-after (beg end len)
(push `(AFTER ,beg ,end ,len) sanity-check-change-functions-op)
(sanity-check--message "After : %S %S (%S)" beg end len)
(unless (<= (point-min) beg end (point-max))
(sanity-check-change-functions-error
@ -565,7 +567,7 @@
(defun sanity-check-change-functions-errors ()
(sanity-check-change-functions-check-size)
(if sanity-check-change-functions-errors
(cons sanity-check-change-functions-op
(cons (reverse sanity-check-change-functions-op)
sanity-check-change-functions-errors)))
(ert-deftest editfns-tests--before/after-change-functions ()
@ -591,6 +593,24 @@
(decode-coding-region beg (point) 'utf-8)
(should (null (sanity-check-change-functions-errors)))))
(let ((beg (point))) ;bug#78042
(apply #'insert (make-list 5000 "hell\351 "))
(sanity-check-change-functions-with-op 'DECODE-CODING-LARGE-REGION
(decode-coding-region beg (point) 'windows-1252)
(should-not (sanity-check-change-functions-errors))))
(let ((beg (point))) ;bug#78042
(sanity-check-change-functions-with-op 'DECODE-CODING-INSERT
;; The `insert' calls make sure we track the buffer-size
;; so as to detect if `decode-coding-string' fails to run the
;; `*-change-functions'.
(insert "<")
(decode-coding-string "hell\351 " 'windows-1252 nil (current-buffer))
(forward-char 6)
(insert ">")
(should (equal "<hellé >" (buffer-substring beg (point))))
(should-not (sanity-check-change-functions-errors))))
(sanity-check-change-functions-with-op 'ENCODE-CODING-STRING
(encode-coding-string "ééé" 'utf-8 nil (current-buffer))
(should (null (sanity-check-change-functions-errors))))