Fail zlib-decompress-region if loading zlib on Windows failed.

 src/decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil
 if loading zlib failed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 70a1fa28db59058cb55370ce24713b31f90bd9cc..1cb8002ccf7e4218f8fc8fdad6ad6f4c18222298 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil
+       if loading zlib failed.
+
 2013-08-13  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by

diff --git a/src/decompress.c b/src/decompress.c
index b7cd8a6c4045d2111f081f3f6ae8220a97c2884a..452a9210402314abb14810e6eaff9e8f94f31784 100644 (file)
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -146,6 +146,8 @@ This function can be called only in unibyte buffers.  */)
 #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