* 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 52f517ee07784ca2578e445b3041a8679a48ef1e..6a621e2a9d9d987d4b23be82f995ac5ab6a8bd21 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -962,9 +962,14 @@ 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
+       unsigned char const * const p = (unsigned char *) &size;
+       size = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0];
+#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 86d31d8564a7c14d6a79b2e39c56d25f893bedaf..5efc99233e44f3e903bd4fe8e3b6c4316747862c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.12) unstable; urgency=low
+apt (0.8.11.2) unstable; urgency=low
 
   [ David Kalnischkies ]
   * cmdline/apt-get.cc:
@@ -12,8 +12,11 @@ apt (0.8.12) unstable; urgency=low
     - update size of dynamic MMap as we write in from the outside
   * apt-pkg/contrib/mmap.cc:
     - do not try to free the mapping if its is unset
+  * 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>  Sun, 13 Feb 2011 11:36:11 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 13 Feb 2011 12:15:59 +0100
 
 apt (0.8.11.1) unstable; urgency=low