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

Fix decompress gap handling bug

Browse source 
* decompress.c (Fdecompress_gzipped_region): Respect all zlib
errors, and really move the gap to where we want it.
This commit is contained in:
Lars Magne Ingebrigtsen 2013-08-11 22:51:47 +02:00
parent 313546eb79
commit 99a32242b3
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2013-08-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
* decompress.c (Fdecompress_gzipped_region): Respect all zlib
errors, and really move the gap to where we want it.
* lisp.h: Include decompress.c support.
* emacs.c (main): Include decompress.c support.

10
src/decompress.c
View file

@ -63,7 +63,6 @@ This function can only be called in unibyte buffers.*/)
ptrdiff_t count = SPECPDL_INDEX ();
validate_region (&start, &end);
move_gap_both (iend, iend);
if (! NILP (BVAR (current_buffer, enable_multibyte_characters)))
error ("This function can only be called in unibyte buffers");
@ -72,6 +71,7 @@ This function can only be called in unibyte buffers.*/)
the same. */
istart = XINT (start);
iend = XINT (end);
move_gap_both (iend, iend);
stream.zalloc = Z_NULL;
stream.zfree = Z_NULL;
@ -99,13 +99,11 @@ This function can only be called in unibyte buffers.*/)
/* Run inflate() on input until the output buffer isn't full. */
do {
int result;
stream.avail_out = BUFFER_SIZE;
stream.next_out = out;
switch (inflate (&stream, Z_NO_FLUSH)) {
case Z_STREAM_ERROR:
case Z_NEED_DICT:
case Z_DATA_ERROR:
case Z_MEM_ERROR:
result = inflate (&stream, Z_NO_FLUSH);
if (result < 0) {
unbind_to (count, Qnil);
return Qnil;
}