From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 19 Jan 2021 13:23:11 +0000 (+0100)
Subject: http_chunks: correct and clarify a comment on hexnumber length
X-Git-Tag: curl-7_75_0~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13bc1ea9bcef34c4beb384549e4be64e341426db;p=thirdparty%2Fcurl.git

http_chunks: correct and clarify a comment on hexnumber length

... and also rename the define for max length.

Closes #6489
---

diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 70db97e310..3a878242ed 100644
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -137,7 +137,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
     switch(ch->state) {
     case CHUNK_HEX:
       if(isxdigit_ascii(*datap)) {
-        if(ch->hexindex < MAXNUM_SIZE) {
+        if(ch->hexindex < CHUNK_MAXNUM_LEN) {
           ch->hexbuffer[ch->hexindex] = *datap;
           datap++;
           length--;
diff --git a/lib/http_chunks.h b/lib/http_chunks.h
index c8f072a2de..6831613ef6 100644
--- a/lib/http_chunks.h
+++ b/lib/http_chunks.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, 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
@@ -26,10 +26,10 @@ struct connectdata;
 
 /*
  * The longest possible hexadecimal number we support in a chunked transfer.
- * Weird enough, RFC2616 doesn't set a maximum size! Since we use strtoul()
- * to convert it, we "only" support 2^32 bytes chunk data.
+ * Neither RFC2616 nor the later HTTP specs define a maximum chunk size.
+ * For 64 bit curl_off_t we support 16 digits. For 32 bit, 8 digits.
  */
-#define MAXNUM_SIZE 16
+#define CHUNK_MAXNUM_LEN (SIZEOF_CURL_OFF_T * 2)
 
 typedef enum {
   /* await and buffer all hexadecimal digits until we get one that isn't a
@@ -83,7 +83,7 @@ typedef enum {
 const char *Curl_chunked_strerror(CHUNKcode code);
 
 struct Curl_chunker {
-  char hexbuffer[ MAXNUM_SIZE + 1];
+  char hexbuffer[ CHUNK_MAXNUM_LEN + 1]; /* +1 for null-terminator */
   int hexindex;
   ChunkyState state;
   curl_off_t datasize;