generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nic fixed so that Curl_client_write() must not be called with 0 lenth data.

Browse Source 
I edited somewhat and removed trailing whitespaces.
This commit is contained in:
Daniel Stenberg 2003-04-11 16:31:18 +00:00
parent 7b51b2f128
commit fece361a55
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/content_encoding.c
View File

@ -1,8 +1,8 @@
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
* / __| | | | |_) | | * / __| | | | |_) | |
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al.
@ -10,7 +10,7 @@
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html. * are also available at http://curl.haxx.se/docs/copyright.html.
* *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell * You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is * copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file. * furnished to do so, under the terms of the COPYING file.
@ -68,7 +68,7 @@ exit_zlib(z_stream *z, bool *zlib_init, CURLcode result)
} }
CURLcode CURLcode
Curl_unencode_deflate_write(struct SessionHandle *data, Curl_unencode_deflate_write(struct SessionHandle *data,
struct Curl_transfer_keeper *k, struct Curl_transfer_keeper *k,
ssize_t nread) ssize_t nread)
{ {
@ -76,7 +76,7 @@ Curl_unencode_deflate_write(struct SessionHandle *data,
int result; /* Curl_client_write status */ int result; /* Curl_client_write status */
char decomp[DSIZ]; /* Put the decompressed data here. */ char decomp[DSIZ]; /* Put the decompressed data here. */
z_stream *z = &k->z; /* zlib state structure */ z_stream *z = &k->z; /* zlib state structure */
/* Initialize zlib? */ /* Initialize zlib? */
if (!k->zlib_init) { if (!k->zlib_init) {
z->zalloc = (alloc_func)Z_NULL; z->zalloc = (alloc_func)Z_NULL;
@ -100,11 +100,12 @@ Curl_unencode_deflate_write(struct SessionHandle *data,
status = inflate(z, Z_SYNC_FLUSH); status = inflate(z, Z_SYNC_FLUSH);
if (status == Z_OK || status == Z_STREAM_END) { if (status == Z_OK || status == Z_STREAM_END) {
result = Curl_client_write(data, CLIENTWRITE_BODY, decomp, if (DSIZ - z->avail_out) {
DSIZ - z->avail_out); result = Curl_client_write(data, CLIENTWRITE_BODY, decomp,
/* if !CURLE_OK, clean up, return */ DSIZ - z->avail_out);
if (result) { /* if !CURLE_OK, clean up, return */
return exit_zlib(z, &k->zlib_init, result); if (result)
return exit_zlib(z, &k->zlib_init, result);
} }
/* Done?; clean up, return */ /* Done?; clean up, return */
@ -116,7 +117,7 @@ Curl_unencode_deflate_write(struct SessionHandle *data,
} }
/* Done with these bytes, exit */ /* Done with these bytes, exit */
if (status == Z_OK && z->avail_in == 0 && z->avail_out > 0) if (status == Z_OK && z->avail_in == 0 && z->avail_out > 0)
return result; return result;
} }
else { /* Error; exit loop, handle below */ else { /* Error; exit loop, handle below */
@ -130,8 +131,7 @@ static enum {
GZIP_OK, GZIP_OK,
GZIP_BAD, GZIP_BAD,
GZIP_UNDERFLOW GZIP_UNDERFLOW
} } check_gzip_header(unsigned char const *data, ssize_t len, ssize_t *headerlen)
check_gzip_header(unsigned char const *data, ssize_t len, ssize_t *headerlen)
{ {
int method, flags; int method, flags;
const ssize_t totallen = len; const ssize_t totallen = len;
@ -210,7 +210,7 @@ check_gzip_header(unsigned char const *data, ssize_t len, ssize_t *headerlen)
} }
CURLcode CURLcode
Curl_unencode_gzip_write(struct SessionHandle *data, Curl_unencode_gzip_write(struct SessionHandle *data,
struct Curl_transfer_keeper *k, struct Curl_transfer_keeper *k,
ssize_t nread) ssize_t nread)
{ {
@ -218,7 +218,7 @@ Curl_unencode_gzip_write(struct SessionHandle *data,
int result; /* Curl_client_write status */ int result; /* Curl_client_write status */
char decomp[DSIZ]; /* Put the decompressed data here. */ char decomp[DSIZ]; /* Put the decompressed data here. */
z_stream *z = &k->z; /* zlib state structure */ z_stream *z = &k->z; /* zlib state structure */
/* Initialize zlib? */ /* Initialize zlib? */
if (!k->zlib_init) { if (!k->zlib_init) {
z->zalloc = (alloc_func)Z_NULL; z->zalloc = (alloc_func)Z_NULL;
@ -320,11 +320,12 @@ Curl_unencode_gzip_write(struct SessionHandle *data,
status = inflate(z, Z_SYNC_FLUSH); status = inflate(z, Z_SYNC_FLUSH);
if (status == Z_OK || status == Z_STREAM_END) { if (status == Z_OK || status == Z_STREAM_END) {
result = Curl_client_write(data, CLIENTWRITE_BODY, decomp, if(DSIZ - z->avail_out) {
DSIZ - z->avail_out); result = Curl_client_write(data, CLIENTWRITE_BODY, decomp,
/* if !CURLE_OK, clean up, return */ DSIZ - z->avail_out);
if (result) { /* if !CURLE_OK, clean up, return */
return exit_zlib(z, &k->zlib_init, result); if (result)
return exit_zlib(z, &k->zlib_init, result);
} }
/* Done?; clean up, return */ /* Done?; clean up, return */
@ -337,7 +338,7 @@ Curl_unencode_gzip_write(struct SessionHandle *data,
} }
/* Done with these bytes, exit */ /* Done with these bytes, exit */
if (status == Z_OK && z->avail_in == 0 && z->avail_out > 0) if (status == Z_OK && z->avail_in == 0 && z->avail_out > 0)
return result; return result;
} }
else { /* Error; exit loop, handle below */ else { /* Error; exit loop, handle below */