explicitly check if ERROR_OUTPUT is a stream object before attempting…

… to open it
gap-system · Nov 23, 2018 · 2949b24 · 2949b24
1 parent 3eb2f2a
commit 2949b24
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/error.c b/src/error.c
@@ -34,6 +34,7 @@
 
 static Obj ErrorInner;
 static Obj ERROR_OUTPUT = NULL;
+static Obj IsOutputStream;
 
 
 /****************************************************************************
@@ -57,7 +58,9 @@ UInt OpenErrorOutput( void )
             ret = OpenOutput(CONST_CSTR_STRING(ERROR_OUTPUT));
         }
         else {
-            ret = OpenOutputStream(ERROR_OUTPUT);
+            if (CALL_1ARGS(IsOutputStream, ERROR_OUTPUT) == True) {
+                ret = OpenOutputStream(ERROR_OUTPUT);
+            }
         }
     }
 
@@ -618,6 +621,7 @@ static Int InitKernel(StructInitInfo * module)
     InitHdlrFuncsFromTable(GVarFuncs);
 
     ImportFuncFromLibrary("ErrorInner", &ErrorInner);
+    ImportFuncFromLibrary("IsOutputStream", &IsOutputStream);
     ImportGVarFromLibrary("ERROR_OUTPUT", &ERROR_OUTPUT);
 
     // return success