Kaynağa Gözat

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

Guillem Jover 19 yıl önce
ebeveyn
işleme
1ec6f59378
3 değiştirilmiş dosya ile 7 ekleme ve 1 silme
  1. 5 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 1 1
      lib/compression.c

+ 5 - 0
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.

+ 1 - 0
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).

+ 1 - 1
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);
             }