← Commit list

6b9c75e219

Daniel Stenberg

2025-12-22

SUCCESS Duration: 250s

Subject

content_encoding: avoid strcpy

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/content_encoding.c +19 -42 lib/content_encoding.h +2 -1 lib/setopt.c +6 -3

lib/content_encoding.c+19 -42

@@ -25,6 +25,7 @@
	#include "curl_setup.h"

	#include "urldata.h"
+	#include "curlx/dynbuf.h"

	#ifdef HAVE_LIBZ
	#include <zlib.h>
@@ -607,41 +608,27 @@ static const struct Curl_cwtype * const transfer_unencoders[] = {
	NULL
	};

-	/* Provide a list of comma-separated names of supported encodings.
+	/* Return the list of comma-separated names of supported encodings.
	*/
-	void Curl_all_content_encodings(char *buf, size_t blen)
+	char *Curl_get_content_encodings(void)
	{
-	size_t len = 0;
+	struct dynbuf enc;
	const struct Curl_cwtype * const *cep;
-	const struct Curl_cwtype *ce;
-
-	DEBUGASSERT(buf);
-	DEBUGASSERT(blen);
-	buf[0] = 0;
-
-	for(cep = general_unencoders; *cep; cep++) {
-	ce = *cep;
-	if(!curl_strequal(ce->name, CONTENT_ENCODING_DEFAULT))
-	len += strlen(ce->name) + 2;
-	}
+	CURLcode result = CURLE_OK;
+	curlx_dyn_init(&enc, 255);

-	if(!len) {
-	if(blen >= sizeof(CONTENT_ENCODING_DEFAULT))
-	strcpy(buf, CONTENT_ENCODING_DEFAULT);
-	}
-	else if(blen > len) {
-	char *p = buf;
-	for(cep = general_unencoders; *cep; cep++) {
-	ce = *cep;
-	if(!curl_strequal(ce->name, CONTENT_ENCODING_DEFAULT)) {
-	strcpy(p, ce->name);
-	p += strlen(p);
-	*p++ = ',';
-	*p++ = ' ';
-	}
+	for(cep = general_unencoders; *cep && !result; cep++) {
+	const struct Curl_cwtype ce = cep;
+	if(!curl_strequal(ce->name, CONTENT_ENCODING_DEFAULT)) {
+	if(curlx_dyn_len(&enc))
+	result = curlx_dyn_addn(&enc, ", ", 2);
+	if(!result)
+	result = curlx_dyn_add(&enc, ce->name);
	}
-	p[-2] = '\0';
	}
+	if(!result)
+	return curlx_dyn_ptr(&enc);
+	return NULL;
	}

	/* Deferred error dummy writer. */
@@ -663,12 +650,7 @@ static CURLcode error_do_write(struct Curl_easy *data,

	if(!(type & CLIENTWRITE_BODY) \|\| !nbytes)
	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
-	else {
-	char all[256];
-	(void)Curl_all_content_encodings(all, sizeof(all));
-	failf(data, "Unrecognized content encoding type. "
-	"libcurl understands %s content encodings.", all);
-	}
+	failf(data, "Unrecognized content encoding type");
	return CURLE_BAD_CONTENT_ENCODING;
	}

@@ -835,14 +817,9 @@ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	return CURLE_NOT_BUILT_IN;
	}

-	void Curl_all_content_encodings(char *buf, size_t blen)
+	char *Curl_get_content_encodings(void)
	{
-	DEBUGASSERT(buf);
-	DEBUGASSERT(blen);
-	if(blen < sizeof(CONTENT_ENCODING_DEFAULT))
-	buf[0] = 0;
-	else
-	strcpy(buf, CONTENT_ENCODING_DEFAULT);
+	return curlx_strdup(CONTENT_ENCODING_DEFAULT);
	}

	#endif /* CURL_DISABLE_HTTP */

lib/content_encoding.h+2 -1

@@ -27,7 +27,8 @@

	struct Curl_cwriter;

-	void Curl_all_content_encodings(char *buf, size_t blen);
+	/* returns an allocated string or NULL */
+	char *Curl_get_content_encodings(void);

	CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	const char *enclist, int is_transfer);

lib/setopt.c+6 -3

@@ -1726,9 +1726,12 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option,
	*
	*/
	if(ptr && !*ptr) {
-	char all[256];
-	Curl_all_content_encodings(all, sizeof(all));
-	return Curl_setstropt(&s->str[STRING_ENCODING], all);
+	ptr = Curl_get_content_encodings();
+	if(ptr)
+	s->str[STRING_ENCODING] = ptr;
+	else
+	result = CURLE_OUT_OF_MEMORY;
+	return result;
	}
	return Curl_setstropt(&s->str[STRING_ENCODING], ptr);