Commit d9459b54 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

better treatment of the config->errors, only fclose() this if it was 

truly fopen()ed. It could end up fclose()ing a NULL as discovered by
Clifford Wolf.
parent 017be8a8

src/main.c

+5 −4
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ struct Configurable { 
  char *writeout; /* %-styled format string to output */



  FILE *errors; /* if stderr redirect is requested */

  bool errors_fopened;



  struct curl_slist *quote;

  struct curl_slist *postquote;
@@ -1031,8 +1032,10 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ 
      config->crlf = TRUE;

      break;

    case '8': /* there is no short letter for this */

      if(strcmp(nextarg, "-"))

      if(strcmp(nextarg, "-")) {

        config->errors = fopen(nextarg, "wt");

        config->errors_fopened = TRUE;

      }

      else

        config->errors = stdout;

      break;
@@ -2487,9 +2490,7 @@ operate(struct Configurable *config, int argc, char *argv[]) 
  /* cleanup the curl handle! */

  curl_easy_cleanup(curl);



  if((config->errors != stderr) &&

     (config->errors != stdout))

    /* it wasn't directed to stdout or stderr so close the file! */

  if(config->errors_fopened)

    fclose(config->errors);



  main_free(); /* cleanup */