[prev in list] [next in list] [prev in thread] [next in thread] 

List:       nsis-commits
Subject:    [NSIS-commits] SF.net SVN: nsis:[7083] NSIS/trunk
From:       anders_k--- via NSIS-commits <nsis-commits () lists ! sourceforge ! net>
Date:       2019-02-12 0:05:30
Message-ID: 1549929931.167375.28171 () sfp-scm-7 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]

Revision: 7083
          http://sourceforge.net/p/nsis/code/7083
Author:   anders_k
Date:     2019-02-12 00:05:28 +0000 (Tue, 12 Feb 2019)
Log Message:
-----------
Fixed -O double fclose (bug #1221)

Modified Paths:
--------------
    NSIS/trunk/Docs/src/history.but
    NSIS/trunk/Source/makenssi.cpp

Modified: NSIS/trunk/Docs/src/history.but
===================================================================
--- NSIS/trunk/Docs/src/history.but	2019-02-11 20:32:42 UTC (rev 7082)
+++ NSIS/trunk/Docs/src/history.but	2019-02-12 00:05:28 UTC (rev 7083)
@@ -16,6 +16,8 @@
 
 \b Added \R{loadandsetimage}{LoadAndSetImage}
 
+\b Fixed -O stderr stream issue (\W{http://sf.net/p/nsis/bugs/1221}{bug #1221})
+
 \S2{} Translations
 
 \b Updated Hindi (\W{http://sf.net/p/nsis/patches/291}{patch #291}) and Portuguese \
(\W{http://sf.net/p/nsis/bugs/1219}{bug #1219})

Modified: NSIS/trunk/Source/makenssi.cpp
===================================================================
--- NSIS/trunk/Source/makenssi.cpp	2019-02-11 20:32:42 UTC (rev 7082)
+++ NSIS/trunk/Source/makenssi.cpp	2019-02-12 00:05:28 UTC (rev 7083)
@@ -70,8 +70,10 @@
 {
   dopause();
   ResetPrintColor();
-  if (g_output != stdout && g_output) fclose(g_output), g_output = 0;
-  if (g_errout != stderr && g_errout) fclose(g_errout), g_errout = 0;
+  bool oneoutputstream = g_output == g_errout;
+  if (g_output != stdout && g_output                    ) fclose(g_output);
+  if (g_errout != stderr && g_errout && !oneoutputstream) fclose(g_errout);
+  g_output = g_errout = 0;
 #ifdef _WIN32
   SetConsoleOutputCP(g_wincon_orgoutcp);
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.



_______________________________________________
NSIS-commits mailing list
NSIS-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nsis-commits


[prev in list] [next in list] [prev in thread] [next in thread]