diff options
| author | Brandon Casey <drafnel@gmail.com> | 2014-08-29 23:48:03 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-09-07 23:23:12 +0200 |
| commit | 6beb0eeea17cd6cc71cb69737ac63861a8f18d4e (patch) | |
| tree | a3845f28b7cbf165d5340c045ec71bf0763b0bef /lib/pop3.c | |
| parent | 8acbb074f8816156c250cd39c9ea53cbba670302 (diff) | |
Ensure progress.size_dl/progress.size_ul are always >= 0
Historically the default "unknown" value for progress.size_dl and
progress.size_ul has been zero, since these values are initialized
implicitly by the calloc that allocates the curl handle that these
variables are a part of. Users of curl that install progress
callbacks may expect these values to always be >= 0.
Currently it is possible for progress.size_dl and progress.size_ul
to by set to a value of -1, if Curl_pgrsSetDownloadSize() or
Curl_pgrsSetUploadSize() are passed a "size" of -1 (which a few
places currently do, and a following patch will add more). So
lets update Curl_pgrsSetDownloadSize() and Curl_pgrsSetUploadSize()
so they make sure that these variables always contain a value that
is >= 0.
Updates test579 and test599.
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Diffstat (limited to 'lib/pop3.c')
| -rw-r--r-- | lib/pop3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pop3.c b/lib/pop3.c index e69f5c5cf..dc64f8106 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -1935,8 +1935,8 @@ static CURLcode pop3_regular_transfer(struct connectdata *conn, /* Set the progress data */ Curl_pgrsSetUploadCounter(data, 0); Curl_pgrsSetDownloadCounter(data, 0); - Curl_pgrsSetUploadSize(data, 0); - Curl_pgrsSetDownloadSize(data, 0); + Curl_pgrsSetUploadSize(data, -1); + Curl_pgrsSetDownloadSize(data, -1); /* Carry out the perform */ result = pop3_perform(conn, &connected, dophase_done); |