fixup a config file specified with CURL_RC needs to exist

curl · Apr 15, 2024 · 4968632 · 4968632
1 parent f44badd
commit 4968632
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/tool_operate.c b/src/tool_operate.c
@@ -2721,10 +2721,14 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[])
                      !strcmp(first_arg, "--verbose"))) {
       configdebug = TRUE;
     }
-    parseconfig(curlrc, global); /* ignore possible failure */
+    if(parseconfig(curlrc, global)) {
+      if(curlrc)
+        errorf(global, "The config file provided in CURL_RC trigged an error");
+      result = CURLE_FAILED_INIT;
+    }
 
     /* If we had no arguments then make sure a url was specified in .curlrc */
-    if((argc < 2) && (!global->first->url_list)) {
+    else if((argc < 2) && (!global->first->url_list)) {
       helpf(tool_stderr, NULL);
       result = CURLE_FAILED_INIT;
     }

diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
@@ -115,8 +115,14 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
 #endif
   }
   else {
-    if(strcmp(filename, "-"))
+    if(strcmp(filename, "-")) {
       file = fopen(filename, FOPEN_READTEXT);
+
+      if(!file) {
+        msgf(global, "config: ", "could not read '%s'", filename);
+        rc = 1;
+      }
+    }
     else
       file = stdin;
   }
@@ -294,8 +300,6 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
     if(fileerror)
       rc = 1;
   }
-  else
-    rc = 1; /* couldn't open the file */
 
   free(pathalloc);
   return rc;