Commit 41fb6443 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

formadd: CURLFORM_FILECONTENT wrongly rejected some option combos 

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
parent e5dfe6c2

lib/formdata.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost, 


      /* Get contents from a given file name */

    case CURLFORM_FILECONTENT:

      if(current_form->flags != 0)

      if(current_form->flags & (HTTPPOST_PTRCONTENTS|HTTPPOST_READFILE))

        return_value = CURL_FORMADD_OPTION_TWICE;

      else {

        const char *filename = array_state?