* apt-pkg/contrib/fileutl.cc:

  - reorder the loaded filesize bytes for big endian (Closes: #612986)
    Thanks to Jörg Sommer for the detailed analyse!

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index f4ab066d744424dcb4bc34d8b465b1947b16670f..266d480a4b17ab5183074483a5cb28adffa7821a 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -42,6 +42,11 @@
 #include <errno.h>
 #include <set>
 #include <algorithm>
+
+#include <config.h>
+#ifdef WORDS_BIGENDIAN
+#include <inttypes.h>
+#endif
                                                                        /*}}}*/
 
 using namespace std;
@@ -940,9 +945,16 @@ unsigned long FileFd::Size()
        off_t orig_pos = lseek(iFd, 0, SEEK_CUR);
        if (lseek(iFd, -4, SEEK_END) < 0)
           return _error->Errno("lseek","Unable to seek to end of gzipped file");
+       size = 0L;
        if (read(iFd, &size, 4) != 4)
           return _error->Errno("read","Unable to read original size of gzipped file");
-       size &= 0xFFFFFFFF;
+
+#ifdef WORDS_BIGENDIAN
+       uint32_t tmp_size = size;
+       uint8_t const * const p = (uint8_t const * const) &tmp_size;
+       tmp_size = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0];
+       size = tmp_size;
+#endif
 
        if (lseek(iFd, orig_pos, SEEK_SET) < 0)
           return _error->Errno("lseek","Unable to seek in gzipped file");

diff --git a/debian/changelog b/debian/changelog
index 364203044412d694236442982fe3d40806b66079..b3907ac0ffc409ad978101fdf207858839997119 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,12 @@ apt (0.8.10.3+squeeze1) UNRELEASED; urgency=low
   * Fix error in French translation of manpages (apt_preferences(5)).
     Merci, Rémi Vanicat. Closes: #613689
 
+  [ David Kalnischkies ]
+  * apt-pkg/contrib/fileutl.cc:
+    - reorder the loaded filesize bytes for big endian (Closes: #612986)
+      Thanks to Jörg Sommer for the detailed analyse!
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 Feb 2011 11:19:50 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 Feb 2011 11:25:58 +0100
 
 apt (0.8.10.3) unstable; urgency=low