summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--methods/bzip2.cc3
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 23c1218d9..f72cad087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,10 @@ apt (0.8.0~pre1) UNRELASED; urgency=low
- fix LongDesc handling in LANG=C environment
* apt-pkg/contrib/strutl.cc:
- fix error checking for vsnprintf in its safe variant
+ * methods/bzip2.cc:
+ - fix error checking for read in case of failing bzip2/lzma/whatever
- -- David Kalnischkies <kalnischkies@gmail.com> Mon, 16 Aug 2010 11:35:53 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Mon, 16 Aug 2010 12:07:54 +0200
apt (0.7.26~exp12) experimental; urgency=low
diff --git a/methods/bzip2.cc b/methods/bzip2.cc
index 19e49828e..241f21c66 100644
--- a/methods/bzip2.cc
+++ b/methods/bzip2.cc
@@ -102,9 +102,8 @@ bool Bzip2Method::Fetch(FetchItem *Itm)
while (1)
{
unsigned char Buffer[4*1024];
- unsigned long Count;
- Count = read(GzOut[0],Buffer,sizeof(Buffer));
+ ssize_t Count = read(GzOut[0],Buffer,sizeof(Buffer));
if (Count < 0 && errno == EINTR)
continue;