Chris Combes added CURLFORM_BUFFER, CURLFORM_BUFFERPTR, CURLFORM_BUFFERLENGTH (131645dc) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

include/curl/curl.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,11 @@ struct curl_httppost {
		long namelength; /* length of name length */
		char contents; / pointer to allocated data contents */
		long contentslength; /* length of contents field */

		/* CMC: Added support for buffer uploads */
		char buffer; / pointer to allocated buffer contents */
		long bufferlength; /* length of buffer field */

		char contenttype; / Content-Type */
		struct curl_slist* contentheader; /* list of extra headers for this form */
		struct curl_httppost more; / if one field name has more than one file, this
		@@ -76,6 +81,11 @@ struct curl_httppost {
		do not free in formfree */
		#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer
		do not free in formfree */

		/* CMC: Added support for buffer uploads */
		#define HTTPPOST_BUFFER (1<<4) /* upload file from buffer */
		#define HTTPPOST_PTRBUFFER (1<<5) /* upload file from pointer contents */

		char showfilename; / The file name to show. If not set, the actual
		file name will be used (if this is a file part) */
		};
		@@ -658,6 +668,11 @@ typedef enum {
		CFINIT(ARRAY),
		CFINIT(OBSOLETE),
		CFINIT(FILE),

		CFINIT(BUFFER),
		CFINIT(BUFFERPTR),
		CFINIT(BUFFERLENGTH),

		CFINIT(CONTENTTYPE),
		CFINIT(CONTENTHEADER),
		CFINIT(FILENAME),

lib/formdata.c

+130 −42

Original line number	Diff line number	Diff line
		@@ -400,6 +400,10 @@ int curl_formparse(char *input,
		static struct curl_httppost *
		AddHttpPost(char * name, long namelength,
		char * value, long contentslength,

		/* CMC: Added support for buffer uploads */
		char * buffer, long bufferlength,

		char *contenttype,
		long flags,
		struct curl_slist* contentHeader,
		@@ -416,6 +420,11 @@ AddHttpPost(char * name, long namelength,
		post->namelength = name?(namelength?namelength:(long)strlen(name)):0;
		post->contents = value;
		post->contentslength = contentslength;

		/* CMC: Added support for buffer uploads */
		post->buffer = buffer;
		post->bufferlength = bufferlength;

		post->contenttype = contenttype;
		post->contentheader = contentHeader;
		post->showfilename = showfilename;
		@@ -783,6 +792,60 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
		}
		break;
		}

		/* CMC: Added support for buffer uploads */
		case CURLFORM_BUFFER:
		{
		char *filename = array_state?array_value:
		va_arg(params, char *);

		if (current_form->value) {
		if (current_form->flags & HTTPPOST_BUFFER) {
		if (filename) {
		if (!(current_form = AddFormInfo(strdup(filename),
		NULL, current_form)))
		return_value = CURL_FORMADD_MEMORY;
		}
		else
		return_value = CURL_FORMADD_NULL;
		}
		else
		return_value = CURL_FORMADD_OPTION_TWICE;
		}
		else {
		if (filename)
		current_form->value = strdup(filename);
		else
		return_value = CURL_FORMADD_NULL;
		current_form->flags \|= HTTPPOST_BUFFER;
		}
		break;
		}

		/* CMC: Added support for buffer uploads */
		case CURLFORM_BUFFERPTR:
		current_form->flags \|= HTTPPOST_PTRBUFFER;
		if (current_form->buffer)
		return_value = CURL_FORMADD_OPTION_TWICE;
		else {
		char *buffer =
		array_state?array_value:va_arg(params, char *);
		if (buffer)
		current_form->buffer = buffer; /* store for the moment */
		else
		return_value = CURL_FORMADD_NULL;
		}
		break;

		/* CMC: Added support for buffer uploads */
		case CURLFORM_BUFFERLENGTH:
		if (current_form->bufferlength)
		return_value = CURL_FORMADD_OPTION_TWICE;
		else
		current_form->bufferlength =
		array_state?(long)array_value:va_arg(params, long);
		break;

		case CURLFORM_CONTENTTYPE:
		{
		char *contenttype =
		@@ -852,6 +915,12 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
		(form->flags & HTTPPOST_FILENAME) ) \|\|
		( (form->flags & HTTPPOST_FILENAME) &&
		(form->flags & HTTPPOST_PTRCONTENTS) ) \|\|

		/* CMC: Added support for buffer uploads */
		( (!form->buffer) &&
		(form->flags & HTTPPOST_BUFFER) &&
		(form->flags & HTTPPOST_PTRBUFFER) ) \|\|

		( (form->flags & HTTPPOST_READFILE) &&
		(form->flags & HTTPPOST_PTRCONTENTS) )
		) {
		@@ -859,7 +928,8 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
		break;
		}
		else {
		if ( (form->flags & HTTPPOST_FILENAME) &&
		if ( ((form->flags & HTTPPOST_FILENAME) \|\|
		(form->flags & HTTPPOST_BUFFER)) &&
		!form->contenttype ) {
		/* our contenttype is missing */
		form->contenttype
		@@ -875,7 +945,11 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
		}
		if ( !(form->flags & HTTPPOST_FILENAME) &&
		!(form->flags & HTTPPOST_READFILE) &&
		!(form->flags & HTTPPOST_PTRCONTENTS) ) {
		!(form->flags & HTTPPOST_PTRCONTENTS) &&

		/* CMC: Added support for buffer uploads */
		!(form->flags & HTTPPOST_PTRBUFFER) ) {

		/* copy value (without strdup; possibly contains null characters) */
		if (AllocAndCopy(&form->value, form->contentslength)) {
		return_value = CURL_FORMADD_MEMORY;
		@@ -884,6 +958,10 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
		}
		post = AddHttpPost(form->name, form->namelength,
		form->value, form->contentslength,

		/* CMC: Added support for buffer uploads */
		form->buffer, form->bufferlength,

		form->contenttype, form->flags,
		form->contentheader, form->showfilename,
		post, httppost,
		@@ -1107,7 +1185,11 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		(file->showfilename?file->showfilename:
		file->contents));
		}
		else if(post->flags & HTTPPOST_FILENAME) {
		else if((post->flags & HTTPPOST_FILENAME) \|\|

		/* CMC: Added support for buffer uploads */
		(post->flags & HTTPPOST_BUFFER)) {

		size += AddFormDataf(&form,
		"; filename=\"%s\"",
		(post->showfilename?post->showfilename:
		@@ -1173,7 +1255,13 @@ CURLcode Curl_getFormData(struct FormData **finalform,
		*finalform = NULL;
		return CURLE_READ_ERROR;
		}

		/* CMC: Added support for buffer uploads */
		} else if (post->flags & HTTPPOST_BUFFER) {
		/* include contents of buffer */
		size += AddFormData(&form, post->buffer, post->bufferlength);
		}

		else {
		/* include the contents we got */
		size += AddFormData(&form, post->contents, post->contentslength);

lib/formdata.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,10 @@ typedef struct FormInfo {
		char *contenttype;
		long flags;

		/* CMC: Added support for buffer uploads */
		char buffer; / pointer to existing buffer used for file upload */
		long bufferlength;

		char showfilename; / The file name to show. If not set, the actual
		file name will be used */
		struct curl_slist* contentheader;