procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash with insert-file-contents and misdecoded text.

Browse source 
* fileio.c (Finsert_file_contents): Set CODING_MODE_LAST_BLOCK
before invoking decode_coding_gap, since there's just one block.

Fixes: debbugs:16286
This commit is contained in:
Paul Eggert 2014-01-25 16:32:30 -08:00
parent ed85dee69d
commit 4f8c23b129
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-01-26 Paul Eggert <eggert@cs.ucla.edu>
Fix crash with insert-file-contents and misdecoded text (Bug#16286).
* fileio.c (Finsert_file_contents): Set CODING_MODE_LAST_BLOCK
before invoking decode_coding_gap, since there's just one block.
2014-01-25 Martin Rudalics <rudalics@gmx.at>
Fix handling of face attributes in Fx_create_frame (Bug#16529).

1
src/fileio.c
View file

@ -4298,6 +4298,7 @@ by calling `format-decode', which see. */)
Z_BYTE -= inserted;
ZV -= inserted;
Z -= inserted;
coding.mode |= CODING_MODE_LAST_BLOCK;
decode_coding_gap (&coding, inserted, inserted);
inserted = coding.produced_char;
coding_system = CODING_ID_NAME (coding.id);