Merge pull request #124 from yury/fix-ios_dup2

holzschu · web-flow · commit 23376c926677 · 2021-10-05T19:14:35.000+02:00
Check FILE* is not NULL before calling fileno function
diff --git a/ios_system.m b/ios_system.m
@@ -1696,9 +1696,9 @@ int ios_dup2(int fd1, int fd2)
             case 2: child_stderr = stream1; return fd2;
         }
     }
-    if ((fd2 == 0) || (fd2 == fileno(thread_stdin))) { child_stdin = fdopen(fd1, "rb"); }
-    else if ((fd2 == 1) || (fd2 == fileno(thread_stdout))) { child_stdout = fdopen(fd1, "wb"); }
-    else if ((fd2 == 2) || (fd2 == fileno(thread_stderr))) {
+    if ((fd2 == 0) || (thread_stdin != NULL && fd2 == fileno(thread_stdin))) { child_stdin = fdopen(fd1, "rb"); }
+    else if ((fd2 == 1) || (thread_stdout != NULL && fd2 == fileno(thread_stdout))) { child_stdout = fdopen(fd1, "wb"); }
+    else if ((fd2 == 2) || (thread_stderr != NULL && fd2 == fileno(thread_stderr))) {
         if ((child_stdout != NULL) && (fileno(child_stdout) == fd1)) child_stderr = child_stdout;
         else child_stderr = fdopen(fd1, "wb"); }
     else if (fd1 != fd2) {

Original file line number	Diff line number	Diff line change
`@@ -1696,9 +1696,9 @@ int ios_dup2(int fd1, int fd2)`
`1696`	`1696`	`case 2: child_stderr = stream1; return fd2;`
`1697`	`1697`	`}`
`1698`	`1698`	`}`
`1699`		`- if ((fd2 == 0) \|\| (fd2 == fileno(thread_stdin))) { child_stdin = fdopen(fd1, "rb"); }`
`1700`		`- else if ((fd2 == 1) \|\| (fd2 == fileno(thread_stdout))) { child_stdout = fdopen(fd1, "wb"); }`
`1701`		`- else if ((fd2 == 2) \|\| (fd2 == fileno(thread_stderr))) {`
	`1699`	`+ if ((fd2 == 0) \|\| (thread_stdin != NULL && fd2 == fileno(thread_stdin))) { child_stdin = fdopen(fd1, "rb"); }`
	`1700`	`+ else if ((fd2 == 1) \|\| (thread_stdout != NULL && fd2 == fileno(thread_stdout))) { child_stdout = fdopen(fd1, "wb"); }`
	`1701`	`+ else if ((fd2 == 2) \|\| (thread_stderr != NULL && fd2 == fileno(thread_stderr))) {`
`1702`	`1702`	`if ((child_stdout != NULL) && (fileno(child_stdout) == fd1)) child_stderr = child_stdout;`
`1703`	`1703`	`else child_stderr = fdopen(fd1, "wb"); }`
`1704`	`1704`	`else if (fd1 != fd2) {`