From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 26 Jan 2014 00:32:30 +0000 (-0800)
Subject: Fix crash with insert-file-contents and misdecoded text.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~249
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f8c23b12913774c1a6cec56eb2bc60b17026af3;p=emacs.git

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

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

Fixes: debbugs:16286
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7ed097976a1..e875bc8a40d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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).
diff --git a/src/fileio.c b/src/fileio.c
index d03a2bcf02f..22db4602249 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -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);