From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 12 Oct 2022 09:49:44 +0000 (+0200)
Subject: curl/main_checkfds: check the fcntl return code better
X-Git-Tag: curl-7_86_0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bb2f64905d52a902767fea39bfa0f426a87a53f;p=thirdparty%2Fcurl.git

curl/main_checkfds: check the fcntl return code better

fcntl() can (in theory) return a non-zero number for success, so a
better test for error is checking for -1 explicitly.

Follow-up to 41e1b30ea1b77e9ff

Mentioned-by: Dominik Klemba

Closes #9708
---

diff --git a/src/tool_main.c b/src/tool_main.c
index 9fe6cf9691..434979dea3 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -90,13 +90,17 @@ int _CRT_glob = 0;
  * open before starting to run.  Otherwise, the first three network
  * sockets opened by curl could be used for input sources, downloaded data
  * or error logs as they will effectively be stdin, stdout and/or stderr.
+ *
+ * fcntl's F_GETFD instruction returns -1 if the file descriptor is closed,
+ * otherwise it returns "the file descriptor flags (which typically can only
+ * be FD_CLOEXEC, which is not set here).
  */
 static int main_checkfds(void)
 {
   int fd[2];
-  while(fcntl(STDIN_FILENO, F_GETFD) ||
-        fcntl(STDOUT_FILENO, F_GETFD) ||
-        fcntl(STDERR_FILENO, F_GETFD))
+  while((fcntl(STDIN_FILENO, F_GETFD) == -1) ||
+        (fcntl(STDOUT_FILENO, F_GETFD) == -1) ||
+        (fcntl(STDERR_FILENO, F_GETFD) == -1))
     if(pipe(fd))
       return 1;
   return 0;