Changeset 3289

Timestamp:

Jan 6, 2019, 7:03:58 AM (6 years ago)

Author:

bird

Message:

kmk/output.c: Attempts at dealing with infinite recursion occuring on tmpfile() or sync_init() failure.

File:

• trunk/src/kmk/output.c (modified) (2 diffs)

trunk/src/kmk/output.c ¶

@@ -806 +806 @@
 
   if (! tfile)
-    pfatal_with_name ("tmpfile");
+    {
+#ifdef KMK
+      if (output_context && output_context->syncout)
+        output_context->syncout = 0; /* Avoid inifinit recursion. */
+#endif
+      pfatal_with_name ("tmpfile");
+    }
 
   /* Create a duplicate so we can close the stream.  */
   fd = dup (fileno (tfile));
   if (fd < 0)
-    pfatal_with_name ("dup");
+    {
+#ifdef KMK
+      if (output_context && output_context->syncout)
+        output_context->syncout = 0; /* Avoid inifinit recursion. */
+#endif
+      pfatal_with_name ("dup");
+    }
 
   fclose (tfile);
@@ -831 +843 @@
 
   if (combined_output < 0)
-    combined_output = sync_init ();
+    {
+#ifdef KMK /* prevent infinite recursion if sync_init() calls perror_with_name. */
+      combined_output = 0;
+#endif
+      combined_output = sync_init ();
+    }
 
   if (STREAM_OK (stdout))