mirror of
https://github.com/curl/curl.git
synced 2024-11-21 01:16:58 +08:00
84338c4de2
Enable more picky compiler warnings. I've found these options in the nghttp3 project when implementing the CMake quick picky warning functionality for it [1]. `-Wunused-macros` was too noisy to keep around, but fixed a few issues it revealed while testing. - autotools: reflect the more precisely-versioned clang warnings. Follow-up to033f8e2a08
#12324 - autotools: sync between clang and gcc the way we set `no-multichar`. - autotools: avoid setting `-Wstrict-aliasing=3` twice. - autotools: disable `-Wmissing-noreturn` for MSYS gcc targets [2]. It triggers in libtool-generated stub code. - lib/timeval: delete a redundant `!MSDOS` guard from a `WIN32` branch. - lib/curl_setup.h: delete duplicate declaration for `fileno`. Added in initial commitae1912cb0d
(1999-12-29). This suggests this may not be needed anymore, but if it does, we may restore this for those specific (non-Windows) systems. - lib: delete unused macro `FTP_BUFFER_ALLOCSIZE` sincec1d6fe2aaa
. - lib: delete unused macro `isxdigit_ascii` sincef65f750742
. - lib/mqtt: delete unused macro `MQTT_HEADER_LEN`. - lib/multi: delete unused macro `SH_READ`/`SH_WRITE`. - lib/hostip: add `noreturn` function attribute via new `CURL_NORETURN` macro. - lib/mprintf: delete duplicate declaration for `Curl_dyn_vprintf`. - lib/rand: fix `-Wunreachable-code` and related fallouts [3]. - lib/setopt: fix `-Wunreachable-code-break`. - lib/system_win32 and lib/timeval: fix double declarations for `Curl_freq` and `Curl_isVistaOrGreater` in CMake UNITY mode [4]. - lib/warnless: fix double declarations in CMake UNITY mode [5]. This was due to force-disabling the header guard of `warnless.h` to to reapply it to source code coming after `warnless.c` in UNITY builds. This reapplied declarations too, causing the warnings. Solved by adding a header guard for the lines that actually need to be reapplied. - lib/vauth/digest: fix `-Wunreachable-code-break` [6]. - lib/vssh/libssh2: fix `-Wunreachable-code-break` and delete redundant block. - lib/vtls/sectransp: fix `-Wunreachable-code-break` [7]. - lib/vtls/sectransp: suppress `-Wunreachable-code`. Detected in `else` branches of dynamic feature checks, with results known at compile-time, e.g. ```c if(SecCertificateCopySubjectSummary) /* -> true */ ``` Likely fixable as a separate micro-project, but given SecureTransport is deprecated anyway, let's just silence these locally. - src/tool_help: delete duplicate declaration for `helptext`. - src/tool_xattr: fix `-Wunreachable-code`. - tests: delete duplicate declaration for `unitfail` [8]. - tests: delete duplicate declaration for `strncasecompare`. - tests/libtest: delete duplicate declaration for `gethostname`. Originally added in687df5c8c3
(2010-08-02). Got complicated later:c49e9683b8
If there are still systems around with warnings, we may restore the prototype, but limited for those systems. - tests/lib2305: delete duplicate declaration for `libtest_debug_config`. - tests/h2-download: fix `-Wunreachable-code-break`. [1]a70edb08e9/cmake/PickyWarningsC.cmake
[2] https://ci.appveyor.com/project/curlorg/curl/builds/48553586/job/3qkgjauiqla5fj45?fullLog=true#L1675 [3] https://github.com/curl/curl/actions/runs/6880886309/job/18716044703?pr=12331#step:7:72 https://github.com/curl/curl/actions/runs/6883016087/job/18722707368?pr=12331#step:7:109 [4] https://ci.appveyor.com/project/curlorg/curl/builds/48555101/job/9g15qkrriklpf1ut#L204 [5] https://ci.appveyor.com/project/curlorg/curl/builds/48555101/job/9g15qkrriklpf1ut#L218 [6] https://github.com/curl/curl/actions/runs/6880886309/job/18716042927?pr=12331#step:7:290 [7] https://github.com/curl/curl/actions/runs/6891484996/job/18746659406?pr=12331#step:9:1193 [8] https://github.com/curl/curl/actions/runs/6882803986/job/18722082562?pr=12331#step:33:1870 Closes #12331
316 lines
9.5 KiB
C
316 lines
9.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* 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
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifndef CURL_DISABLE_HTTP
|
|
|
|
#include "urldata.h" /* it includes http_chunks.h */
|
|
#include "sendf.h" /* for the client write stuff */
|
|
#include "dynbuf.h"
|
|
#include "content_encoding.h"
|
|
#include "http.h"
|
|
#include "strtoofft.h"
|
|
#include "warnless.h"
|
|
|
|
/* The last #include files should be: */
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
/*
|
|
* Chunk format (simplified):
|
|
*
|
|
* <HEX SIZE>[ chunk extension ] CRLF
|
|
* <DATA> CRLF
|
|
*
|
|
* Highlights from RFC2616 section 3.6 say:
|
|
|
|
The chunked encoding modifies the body of a message in order to
|
|
transfer it as a series of chunks, each with its own size indicator,
|
|
followed by an OPTIONAL trailer containing entity-header fields. This
|
|
allows dynamically produced content to be transferred along with the
|
|
information necessary for the recipient to verify that it has
|
|
received the full message.
|
|
|
|
Chunked-Body = *chunk
|
|
last-chunk
|
|
trailer
|
|
CRLF
|
|
|
|
chunk = chunk-size [ chunk-extension ] CRLF
|
|
chunk-data CRLF
|
|
chunk-size = 1*HEX
|
|
last-chunk = 1*("0") [ chunk-extension ] CRLF
|
|
|
|
chunk-extension= *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
|
|
chunk-ext-name = token
|
|
chunk-ext-val = token | quoted-string
|
|
chunk-data = chunk-size(OCTET)
|
|
trailer = *(entity-header CRLF)
|
|
|
|
The chunk-size field is a string of hex digits indicating the size of
|
|
the chunk. The chunked encoding is ended by any chunk whose size is
|
|
zero, followed by the trailer, which is terminated by an empty line.
|
|
|
|
*/
|
|
|
|
void Curl_httpchunk_init(struct Curl_easy *data)
|
|
{
|
|
struct connectdata *conn = data->conn;
|
|
struct Curl_chunker *chunk = &conn->chunk;
|
|
chunk->hexindex = 0; /* start at 0 */
|
|
chunk->state = CHUNK_HEX; /* we get hex first! */
|
|
Curl_dyn_init(&conn->trailer, DYN_H1_TRAILER);
|
|
}
|
|
|
|
/*
|
|
* chunk_read() returns a OK for normal operations, or a positive return code
|
|
* for errors. STOP means this sequence of chunks is complete. The 'wrote'
|
|
* argument is set to tell the caller how many bytes we actually passed to the
|
|
* client (for byte-counting and whatever).
|
|
*
|
|
* The states and the state-machine is further explained in the header file.
|
|
*
|
|
* This function always uses ASCII hex values to accommodate non-ASCII hosts.
|
|
* For example, 0x0d and 0x0a are used instead of '\r' and '\n'.
|
|
*/
|
|
CHUNKcode Curl_httpchunk_read(struct Curl_easy *data,
|
|
char *buf,
|
|
size_t blen,
|
|
size_t *pconsumed,
|
|
CURLcode *extrap)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
struct connectdata *conn = data->conn;
|
|
struct Curl_chunker *ch = &conn->chunk;
|
|
struct SingleRequest *k = &data->req;
|
|
size_t piece;
|
|
|
|
*pconsumed = 0; /* nothing's written yet */
|
|
|
|
/* the original data is written to the client, but we go on with the
|
|
chunk read process, to properly calculate the content length */
|
|
if(data->set.http_te_skip && !k->ignorebody) {
|
|
result = Curl_client_write(data, CLIENTWRITE_BODY, buf, blen);
|
|
if(result) {
|
|
*extrap = result;
|
|
return CHUNKE_PASSTHRU_ERROR;
|
|
}
|
|
}
|
|
|
|
while(blen) {
|
|
switch(ch->state) {
|
|
case CHUNK_HEX:
|
|
if(ISXDIGIT(*buf)) {
|
|
if(ch->hexindex < CHUNK_MAXNUM_LEN) {
|
|
ch->hexbuffer[ch->hexindex] = *buf;
|
|
buf++;
|
|
blen--;
|
|
ch->hexindex++;
|
|
}
|
|
else {
|
|
return CHUNKE_TOO_LONG_HEX; /* longer hex than we support */
|
|
}
|
|
}
|
|
else {
|
|
char *endptr;
|
|
if(0 == ch->hexindex)
|
|
/* This is illegal data, we received junk where we expected
|
|
a hexadecimal digit. */
|
|
return CHUNKE_ILLEGAL_HEX;
|
|
|
|
/* blen and buf are unmodified */
|
|
ch->hexbuffer[ch->hexindex] = 0;
|
|
|
|
if(curlx_strtoofft(ch->hexbuffer, &endptr, 16, &ch->datasize))
|
|
return CHUNKE_ILLEGAL_HEX;
|
|
ch->state = CHUNK_LF; /* now wait for the CRLF */
|
|
}
|
|
break;
|
|
|
|
case CHUNK_LF:
|
|
/* waiting for the LF after a chunk size */
|
|
if(*buf == 0x0a) {
|
|
/* we're now expecting data to come, unless size was zero! */
|
|
if(0 == ch->datasize) {
|
|
ch->state = CHUNK_TRAILER; /* now check for trailers */
|
|
}
|
|
else
|
|
ch->state = CHUNK_DATA;
|
|
}
|
|
|
|
buf++;
|
|
blen--;
|
|
break;
|
|
|
|
case CHUNK_DATA:
|
|
/* We expect 'datasize' of data. We have 'blen' right now, it can be
|
|
more or less than 'datasize'. Get the smallest piece.
|
|
*/
|
|
piece = blen;
|
|
if(ch->datasize < (curl_off_t)blen)
|
|
piece = curlx_sotouz(ch->datasize);
|
|
|
|
/* Write the data portion available */
|
|
if(!data->set.http_te_skip && !k->ignorebody) {
|
|
result = Curl_client_write(data, CLIENTWRITE_BODY, buf, piece);
|
|
|
|
if(result) {
|
|
*extrap = result;
|
|
return CHUNKE_PASSTHRU_ERROR;
|
|
}
|
|
}
|
|
|
|
*pconsumed += piece;
|
|
ch->datasize -= piece; /* decrease amount left to expect */
|
|
buf += piece; /* move read pointer forward */
|
|
blen -= piece; /* decrease space left in this round */
|
|
|
|
if(0 == ch->datasize)
|
|
/* end of data this round, we now expect a trailing CRLF */
|
|
ch->state = CHUNK_POSTLF;
|
|
break;
|
|
|
|
case CHUNK_POSTLF:
|
|
if(*buf == 0x0a) {
|
|
/* The last one before we go back to hex state and start all over. */
|
|
Curl_httpchunk_init(data); /* sets state back to CHUNK_HEX */
|
|
}
|
|
else if(*buf != 0x0d)
|
|
return CHUNKE_BAD_CHUNK;
|
|
buf++;
|
|
blen--;
|
|
break;
|
|
|
|
case CHUNK_TRAILER:
|
|
if((*buf == 0x0d) || (*buf == 0x0a)) {
|
|
char *tr = Curl_dyn_ptr(&conn->trailer);
|
|
/* this is the end of a trailer, but if the trailer was zero bytes
|
|
there was no trailer and we move on */
|
|
|
|
if(tr) {
|
|
size_t trlen;
|
|
result = Curl_dyn_addn(&conn->trailer, (char *)STRCONST("\x0d\x0a"));
|
|
if(result)
|
|
return CHUNKE_OUT_OF_MEMORY;
|
|
|
|
tr = Curl_dyn_ptr(&conn->trailer);
|
|
trlen = Curl_dyn_len(&conn->trailer);
|
|
if(!data->set.http_te_skip) {
|
|
result = Curl_client_write(data,
|
|
CLIENTWRITE_HEADER|CLIENTWRITE_TRAILER,
|
|
tr, trlen);
|
|
if(result) {
|
|
*extrap = result;
|
|
return CHUNKE_PASSTHRU_ERROR;
|
|
}
|
|
}
|
|
Curl_dyn_reset(&conn->trailer);
|
|
ch->state = CHUNK_TRAILER_CR;
|
|
if(*buf == 0x0a)
|
|
/* already on the LF */
|
|
break;
|
|
}
|
|
else {
|
|
/* no trailer, we're on the final CRLF pair */
|
|
ch->state = CHUNK_TRAILER_POSTCR;
|
|
break; /* don't advance the pointer */
|
|
}
|
|
}
|
|
else {
|
|
result = Curl_dyn_addn(&conn->trailer, buf, 1);
|
|
if(result)
|
|
return CHUNKE_OUT_OF_MEMORY;
|
|
}
|
|
buf++;
|
|
blen--;
|
|
break;
|
|
|
|
case CHUNK_TRAILER_CR:
|
|
if(*buf == 0x0a) {
|
|
ch->state = CHUNK_TRAILER_POSTCR;
|
|
buf++;
|
|
blen--;
|
|
}
|
|
else
|
|
return CHUNKE_BAD_CHUNK;
|
|
break;
|
|
|
|
case CHUNK_TRAILER_POSTCR:
|
|
/* We enter this state when a CR should arrive so we expect to
|
|
have to first pass a CR before we wait for LF */
|
|
if((*buf != 0x0d) && (*buf != 0x0a)) {
|
|
/* not a CR then it must be another header in the trailer */
|
|
ch->state = CHUNK_TRAILER;
|
|
break;
|
|
}
|
|
if(*buf == 0x0d) {
|
|
/* skip if CR */
|
|
buf++;
|
|
blen--;
|
|
}
|
|
/* now wait for the final LF */
|
|
ch->state = CHUNK_STOP;
|
|
break;
|
|
|
|
case CHUNK_STOP:
|
|
if(*buf == 0x0a) {
|
|
blen--;
|
|
|
|
/* Record the length of any data left in the end of the buffer
|
|
even if there's no more chunks to read */
|
|
ch->datasize = blen;
|
|
|
|
return CHUNKE_STOP; /* return stop */
|
|
}
|
|
else
|
|
return CHUNKE_BAD_CHUNK;
|
|
}
|
|
}
|
|
return CHUNKE_OK;
|
|
}
|
|
|
|
const char *Curl_chunked_strerror(CHUNKcode code)
|
|
{
|
|
switch(code) {
|
|
default:
|
|
return "OK";
|
|
case CHUNKE_TOO_LONG_HEX:
|
|
return "Too long hexadecimal number";
|
|
case CHUNKE_ILLEGAL_HEX:
|
|
return "Illegal or missing hexadecimal sequence";
|
|
case CHUNKE_BAD_CHUNK:
|
|
return "Malformed encoding found";
|
|
case CHUNKE_PASSTHRU_ERROR:
|
|
DEBUGASSERT(0); /* never used */
|
|
return "";
|
|
case CHUNKE_BAD_ENCODING:
|
|
return "Bad content-encoding found";
|
|
case CHUNKE_OUT_OF_MEMORY:
|
|
return "Out of memory";
|
|
}
|
|
}
|
|
|
|
#endif /* CURL_DISABLE_HTTP */
|