generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

formadd: CURLFORM_FILECONTENT wrongly rejected some option combos

Browse Source 
The code for CURLFORM_FILECONTENT had its check for duplicate options
wrong so that it would reject CURLFORM_PTRNAME if used in combination
with it (but not CURLFORM_COPYNAME)! The flags field used for this
purpose cannot be interpreted that broadly.

Bug: http://curl.haxx.se/mail/lib-2013-07/0258.html
Reported-by: Byrial Jensen
This commit is contained in:
Daniel Stenberg
2013-07-23 22:10:44 +02:00
parent e5dfe6c282
commit 41fb6443ce
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/formdata.c
View File

@@ -426,7 +426,7 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
/* Get contents from a given file name */ /* Get contents from a given file name */
case CURLFORM_FILECONTENT: case CURLFORM_FILECONTENT:
if(current_form->flags != 0) if(current_form->flags & (HTTPPOST_PTRCONTENTS|HTTPPOST_READFILE))
return_value = CURL_FORMADD_OPTION_TWICE; return_value = CURL_FORMADD_OPTION_TWICE;
else { else {
const char *filename = array_state? const char *filename = array_state?