From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 8 Mar 2002 15:18:03 +0000 (+0000)
Subject: better treatment of the config->errors, only fclose() this if it was
X-Git-Tag: curl-7_9_6~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9459b54d9c79267fd02e989ae3e86bdc4e8a983;p=thirdparty%2Fcurl.git

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.
---

diff --git a/src/main.c b/src/main.c
index 4d30a2c804..885a515eed 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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 */