From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 4 Mar 2005 00:12:02 +0000 (+0000)
Subject: Rene Rebe fixed a -# crash when more data than expected was retrieved.
X-Git-Tag: curl-7_13_1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7012a4a291f2480da9e34cbf111dec26226389c2;p=thirdparty%2Fcurl.git

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

diff --git a/CHANGES b/CHANGES
index b00a20208e..14ab35c6f8 100644
--- 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 f4bf2a146b..a230c898a0 100644
--- 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 c1317ad278..b37d1dae01 100644
--- 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) {