mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-23 15:10:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

content_encoding: namespace GZIP flag constants

Browse Source 
To avoid collision with a 3rd-party `RESERVED` symbols.

This symbol is used in the public header of MSH3 0.7.0.

Closes #15929
This commit is contained in:
Viktor Szakats 2025-01-07 15:59:47 +01:00
parent 0cc458686c
commit 24ef9de9f4
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/content_encoding.c
View File

@ -79,12 +79,14 @@
#define GZIP_MAGIC_1 0x8b
/* gzip flag byte */
#define ASCII_FLAG 0x01 /* bit 0 set: file probably ASCII text */
#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */
#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
#define ORIG_NAME 0x08 /* bit 3 set: original filename present */
#define COMMENT 0x10 /* bit 4 set: file comment present */
#define RESERVED 0xE0 /* bits 5..7: reserved */
#define CURL_GZIPFLAG_ASCII 0x01 /* bit 0 set: file probably ASCII
text */
#define CURL_GZIPFLAG_HEAD_CRC 0x02 /* bit 1 set: header CRC present */
#define CURL_GZIPFLAG_EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
#define CURL_GZIPFLAG_ORIG_NAME 0x08 /* bit 3 set: original filename
present */
#define CURL_GZIPFLAG_COMMENT 0x10 /* bit 4 set: file comment present */
#define CURL_GZIPFLAG_RESERVED 0xE0 /* bits 5..7: reserved */
typedef enum {
ZLIB_UNINIT, /* uninitialized */
@ -387,7 +389,7 @@ static gzip_status check_gzip_header(unsigned char const *data, ssize_t len,
method = data[2];
flags = data[3];
if(method != Z_DEFLATED || (flags & RESERVED) != 0) {
if(method != Z_DEFLATED || (flags & CURL_GZIPFLAG_RESERVED) != 0) {
/* cannot handle this compression method or unknown flag */
return GZIP_BAD;
}
@ -396,7 +398,7 @@ static gzip_status check_gzip_header(unsigned char const *data, ssize_t len,
len -= 10;
data += 10;
if(flags & EXTRA_FIELD) {
if(flags & CURL_GZIPFLAG_EXTRA_FIELD) {
ssize_t extra_len;
if(len < 2)
@ -411,7 +413,7 @@ static gzip_status check_gzip_header(unsigned char const *data, ssize_t len,
data += (extra_len + 2);
}
if(flags & ORIG_NAME) {
if(flags & CURL_GZIPFLAG_ORIG_NAME) {
/* Skip over NUL-terminated filename */
while(len && *data) {
--len;
@ -425,7 +427,7 @@ static gzip_status check_gzip_header(unsigned char const *data, ssize_t len,
++data;
}
if(flags & COMMENT) {
if(flags & CURL_GZIPFLAG_COMMENT) {
/* Skip over NUL-terminated comment */
while(len && *data) {
--len;
@ -438,7 +440,7 @@ static gzip_status check_gzip_header(unsigned char const *data, ssize_t len,
--len;
}
if(flags & HEAD_CRC) {
if(flags & CURL_GZIPFLAG_HEAD_CRC) {
if(len < 2)
return GZIP_UNDERFLOW;