* apt-pkg/acquire.cc:

  - fix potential divide-by-zero

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 2064abc5031d8005b8af2dcae02819c5f4171f51..06b0f11f8179c541eda2fd512bfac89c199d9c90 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -849,7 +849,9 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
 
       char msg[200];
       long i = CurrentItems < TotalItems ? CurrentItems + 1 : CurrentItems;
-      unsigned long long const ETA = (TotalBytes - CurrentBytes) / CurrentCPS;
+      unsigned long long ETA = 0;
+      if(CurrentCPS > 0)
+         ETA = (TotalBytes - CurrentBytes) / CurrentCPS;
 
       // only show the ETA if it makes sense
       if (ETA > 0 && ETA < 172800 /* two days */ )

diff --git a/debian/changelog b/debian/changelog
index 8719776e07123d00c567912faf34c94d184228df..db80c14ef9c36632ab8ea1c175438a28c45e0296 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ apt (0.8.16~exp5) experimental; urgency=low
   * apt-pkg/acquire-item.{cc,h}:
     - do not check for a "Package" tag in optional index targets
       like the translations index
+  * apt-pkg/acquire.cc:
+    - fix potential divide-by-zero
 
  -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 10:57:08 +0200