Check proper error value returned by BZ2_bzerror. Closes: #410605

diff --git a/ChangeLog b/ChangeLog
index fc3f127ea5c3de17710bff9722cf2e1baac1ccd7..1ca73ee9468495ec7e7ea9abd5c8224bb401c991 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-13  Guillem Jover  <guillem@debian.org>
+
+       * lib/compression.c (decompress_cat): Use BZ_IO_ERROR instead of
+       Z_ERRNO for the error value returned by BZ2_bzerror.
+
 2007-02-12  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-shlibdeps.pl: Move syserr:s to be or'ed after exec:s.

diff --git a/debian/changelog b/debian/changelog
index 483d3a7ab83869effffc5f62ec72d9d12eaaaec6..872100779d6f23d2c0e085acb39111efcc0a75bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ dpkg (1.14.0) UNRELEASED; urgency=low
   * Do not use a build-stamp in debian/rules.
   * Fix confusing bottom status lines in dselect, unifying them by removing
     the method or package name and capitalizing. Closes: #9085
+  * Check proper error value returned by BZ2_bzerror. Closes: #410605
 
   [ Updated dpkg translations ]
   * Romanian (Eddy Petrișor).

diff --git a/lib/compression.c b/lib/compression.c
index 7b305e357cb2580d37cc00ad792e24e25313f03e..cdafa3620eae9588a3ad879c5251beb58f2567b4 100644 (file)
--- a/lib/compression.c
+++ b/lib/compression.c
@@ -69,7 +69,7 @@ void decompress_cat(enum compression_type type, int fd_in, int fd_out, char *des
           if (actualread < 0 ) {
             int err = 0;
             const char *errmsg = BZ2_bzerror(bzfile, &err);
-            if (err == Z_ERRNO) {
+            if (err == BZ_IO_ERROR) {
               if (errno == EINTR) continue;
               errmsg= strerror(errno);
             }