summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-02-13 13:06:03 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-02-13 13:06:03 +0100
commitf330c0f347619f72766069acdc24616ec5fe7147 (patch)
tree6a3eacc7dd97bc5fe3ae7aa1d8fec5e653536936 /apt-pkg/contrib
parent005428387832e79e314bb8f2605f7e6c69708d14 (diff)
* apt-pkg/contrib/fileutl.cc:
- reorder the loaded filesize bytes for big endian (Closes: #612986) Thanks to Jörg Sommer for the detailed analyse!
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/fileutl.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 52f517ee0..6a621e2a9 100644
--- 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");