Rene Rebe fixed a -# crash when more data than expected was retrieved.

diff --git a/CHANGES b/CHANGES
index b00a20208ea008532eb4591afd8c3a43f37d132e..14ab35c6f8540154ca7abd520992b832e74f81f6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 
+Daniel (4 March 2005)
+- Rene Rebe fixed a -# crash when more data than expected was retrieved.
+
 Daniel (22 February 2005)
 - NTLM and ftp-krb4 buffer overflow fixed, as reported here:
   http://www.securityfocus.com/archive/1/391042 and the CAN report here:

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f4bf2a146b8a4db476f64ee1ce4bf33b0683296f..a230c898a095a8c3c5e6ac3fcb10ed30fbfc626c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o -# crash when more data than expected was retrieved
  o NTLM/krb4 buffer overflow fixed (CAN-2005-0490)
  o proxy auth bug when following redirects to another host
  o socket leak when local bind failed
@@ -37,6 +38,7 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Gisle Vanem, David Byron, Marty Kuhrt, Maruko, Eric Vergnaud, Christopher
- R. Palmer, Mike Dobbs, David in bug report #1124588, Ralph Mitchell
+ R. Palmer, Mike Dobbs, David in bug report #1124588, Ralph Mitchell,
+ Rene Rebe
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/src/main.c b/src/main.c
index c1317ad27816f2d278625d1d632346c702f476ad..b37d1dae010aab62bd4b60d668863cde01b65e1b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2610,6 +2610,10 @@ static int myprogress (void *clientp,
   curl_off_t point = (curl_off_t)dlnow + (curl_off_t)ulnow +
     bar->initial_size; /* we've come this far */
 
+  if(point > total)
+    /* we have got more than the expected total! */
+    total = point;
+
   bar->calls++; /* simply count invokes */
 
   if(total < 1) {