[Emacs-diffs] trunk r113849: Fail zlib-decompress-region if loading zlib on Windows failed.

[Eli Zaretskii]

------------------------------------------------------------
revno: 113849
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 19:20:39 +0300
message:
  Fail zlib-decompress-region if loading zlib on Windows failed.
  
   src/decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil
   if loading zlib failed.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/decompress.c               decompress.c-20130811194033-wfhl0tqmmc36jfmu-1

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-13 15:45:43 +0000
+++ b/src/ChangeLog     2013-08-13 16:20:39 +0000
@@ -1,3 +1,8 @@
+2013-08-13  Eli Zaretskii  <address@hidden>
+
+       * decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil
+       if loading zlib failed.
+
 2013-08-13  Jan Djärv  <address@hidden>
 
        * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by

=== modified file 'src/decompress.c'
--- a/src/decompress.c  2013-08-13 15:00:58 +0000
+++ b/src/decompress.c  2013-08-13 16:20:39 +0000
@@ -146,6 +146,8 @@
 #ifdef WINDOWSNT
   if (!zlib_initialized)
     zlib_initialized = init_zlib_functions ();
+  if (!zlib_initialized)
+    return Qnil;
 #endif
 
   /* This is a unibyte buffer, so character positions and bytes are