escape: avoid using curl_easy_unescape() internally (46133aa5) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/file.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -193,11 +193,12 @@ static CURLcode file_connect(struct connectdata conn, bool done)
		int i;
		char *actual_path;
		#endif
		int real_path_len;
		size_t real_path_len;

		real_path = curl_easy_unescape(data, data->state.path, 0, &real_path_len);
		if(!real_path)
		return CURLE_OUT_OF_MEMORY;
		CURLcode result = Curl_urldecode(data, data->state.path, 0, &real_path,
		&real_path_len, FALSE);
		if(result)
		return result;

		#ifdef DOS_FILESYSTEM
		/* If the first character is a slash, and there's

lib/ftp.c

+29 −31

Original line number	Diff line number	Diff line
		@@ -3299,8 +3299,8 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status,
		}

		/* get the "raw" path */
		path = curl_easy_unescape(data, path_to_use, 0, NULL);
		if(!path) {
		result = Curl_urldecode(data, path_to_use, 0, &path, NULL, FALSE);
		if(result) {
		/* out of memory, but we can limp along anyway (and should try to
		* since we may already be in the out of memory cleanup path) */
		if(!result)
		@@ -4287,6 +4287,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
		slash_pos=strrchr(cur_pos, '/');
		if(slash_pos \|\| !*cur_pos) {
		size_t dirlen = slash_pos-cur_pos;
		CURLcode result;

		ftpc->dirs = calloc(1, sizeof(ftpc->dirs[0]));
		if(!ftpc->dirs)
		@@ -4295,12 +4296,13 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
		if(!dirlen)
		dirlen++;

		ftpc->dirs[0] = curl_easy_unescape(conn->data, slash_pos ? cur_pos : "/",
		slash_pos ? curlx_uztosi(dirlen) : 1,
		NULL);
		if(!ftpc->dirs[0]) {
		result = Curl_urldecode(conn->data, slash_pos ? cur_pos : "/",
		slash_pos ? dirlen : 1,
		&ftpc->dirs[0], NULL,
		FALSE);
		if(result) {
		freedirs(ftpc);
		return CURLE_OUT_OF_MEMORY;
		return result;
		}
		ftpc->dirdepth = 1; /* we consider it to be a single dir */
		filename = slash_pos ? slash_pos+1 : cur_pos; /* rest is file name */
		@@ -4335,18 +4337,15 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
		/* we skip empty path components, like "x//y" since the FTP command
		CWD requires a parameter and a non-existent parameter a) doesn't
		work on many servers and b) has no effect on the others. */
		int len = curlx_sztosi(slash_pos - cur_pos + absolute_dir);
		ftpc->dirs[ftpc->dirdepth] =
		curl_easy_unescape(conn->data, cur_pos - absolute_dir, len, NULL);
		if(!ftpc->dirs[ftpc->dirdepth]) { /* run out of memory ... */
		failf(data, "no memory");
		freedirs(ftpc);
		return CURLE_OUT_OF_MEMORY;
		}
		if(isBadFtpString(ftpc->dirs[ftpc->dirdepth])) {
		size_t len = slash_pos - cur_pos + absolute_dir;
		CURLcode result =
		Curl_urldecode(conn->data, cur_pos - absolute_dir, len,
		&ftpc->dirs[ftpc->dirdepth], NULL,
		TRUE);
		if(result) {
		free(ftpc->dirs[ftpc->dirdepth]);
		freedirs(ftpc);
		return CURLE_URL_MALFORMAT;
		return result;
		}
		}
		else {
		@@ -4382,15 +4381,12 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
		} /* switch */

		if(filename && *filename) {
		ftpc->file = curl_easy_unescape(conn->data, filename, 0, NULL);
		if(NULL == ftpc->file) {
		freedirs(ftpc);
		failf(data, "no memory");
		return CURLE_OUT_OF_MEMORY;
		}
		if(isBadFtpString(ftpc->file)) {
		CURLcode result =
		Curl_urldecode(conn->data, filename, 0, &ftpc->file, NULL, TRUE);

		if(result) {
		freedirs(ftpc);
		return CURLE_URL_MALFORMAT;
		return result;
		}
		}
		else
		@@ -4408,15 +4404,17 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
		if(ftpc->prevpath) {
		/* prevpath is "raw" so we convert the input path before we compare the
		strings */
		int dlen;
		char *path = curl_easy_unescape(conn->data, data->state.path, 0, &dlen);
		if(!path) {
		size_t dlen;
		char *path;
		CURLcode result =
		Curl_urldecode(conn->data, data->state.path, 0, &path, &dlen, FALSE);
		if(result) {
		freedirs(ftpc);
		return CURLE_OUT_OF_MEMORY;
		return result;
		}

		dlen -= ftpc->file?curlx_uztosi(strlen(ftpc->file)):0;
		if((dlen == curlx_uztosi(strlen(ftpc->prevpath))) &&
		dlen -= ftpc->file?strlen(ftpc->file):0;
		if((dlen == strlen(ftpc->prevpath)) &&
		strnequal(path, ftpc->prevpath, dlen)) {
		infof(data, "Request has same path as previous transfer\n");
		ftpc->cwddone = TRUE;

lib/gopher.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include "rawstr.h"
		#include "select.h"
		#include "url.h"
		#include "escape.h"
		#include "warnless.h"
		#include "curl_memory.h"
		/* The last #include file should be: */
		@@ -83,7 +84,7 @@ static CURLcode gopher_do(struct connectdata conn, bool done)
		char *sel;
		char *sel_org = NULL;
		ssize_t amount, k;
		int len;
		size_t len;

		done = TRUE; / unconditionally */

		@@ -107,7 +108,7 @@ static CURLcode gopher_do(struct connectdata conn, bool done)
		newp[i] = '\x09';

		/* ... and finally unescape */
		sel = curl_easy_unescape(data, newp, 0, &len);
		result = Curl_urldecode(data, newp, 0, &sel, &len, FALSE);
		if(!sel)
		return CURLE_OUT_OF_MEMORY;
		sel_org = sel;

lib/ldap.c

+15 −11

Original line number	Diff line number	Diff line
		@@ -798,12 +798,13 @@ static int _ldap_url_parse2 (const struct connectdata conn, LDAPURLDesc ludp)
		if(*p) {
		char *dn = p;
		char *unescaped;
		CURLcode result;

		LDAP_TRACE (("DN '%s'\n", dn));

		/* Unescape the DN */
		unescaped = curl_easy_unescape(conn->data, dn, 0, NULL);
		if(!unescaped) {
		result = Curl_urldecode(conn->data, dn, 0, &unescaped, NULL, FALSE);
		if(result) {
		rc = LDAP_NO_MEMORY;

		goto quit;
		@@ -862,12 +863,14 @@ static int _ldap_url_parse2 (const struct connectdata conn, LDAPURLDesc ludp)

		for(i = 0; i < count; i++) {
		char *unescaped;
		CURLcode result;

		LDAP_TRACE (("attr[%d] '%s'\n", i, attributes[i]));

		/* Unescape the attribute */
		unescaped = curl_easy_unescape(conn->data, attributes[i], 0, NULL);
		if(!unescaped) {
		result = Curl_urldecode(conn->data, attributes[i], 0, &unescaped, NULL,
		FALSE);
		if(result) {
		free(attributes);

		rc = LDAP_NO_MEMORY;
		@@ -930,12 +933,13 @@ static int _ldap_url_parse2 (const struct connectdata conn, LDAPURLDesc ludp)
		if(*p) {
		char *filter = p;
		char *unescaped;
		CURLcode result;

		LDAP_TRACE (("filter '%s'\n", filter));

		/* Unescape the filter */
		unescaped = curl_easy_unescape(conn->data, filter, 0, NULL);
		if(!unescaped) {
		result = Curl_urldecode(conn->data, filter, 0, &unescaped, NULL, FALSE);
		if(result) {
		rc = LDAP_NO_MEMORY;

		goto quit;

lib/ssh.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -416,12 +416,12 @@ static CURLcode ssh_getworkingpath(struct connectdata *conn,
		struct Curl_easy *data = conn->data;
		char *real_path = NULL;
		char *working_path;
		int working_path_len;

		working_path = curl_easy_unescape(data, data->state.path, 0,
		&working_path_len);
		if(!working_path)
		return CURLE_OUT_OF_MEMORY;
		size_t working_path_len;
		CURLcode result =
		Curl_urldecode(data, data->state.path, 0, &working_path,
		&working_path_len, FALSE);
		if(result)
		return result;

		/* Check for /~/, indicating relative to the user's home directory */
		if(conn->handler->protocol & CURLPROTO_SCP) {