More.

PDAL · Jul 9, 2019 · 55f738b · 55f738b
1 parent cf3704c
commit 55f738b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pdal/util/Utils.hpp b/pdal/util/Utils.hpp
@@ -680,9 +680,14 @@ namespace Utils
     */
     inline void restore(std::ostream& out, RedirectStream& redir)
     {
+        // The buffer must be restored prior to potentially deleting
+        // the source or things could blow up.
         out.rdbuf(redir.m_buf);
         if (redir.m_out)
+        {
             redir.m_out->close();
+            delete redir.m_out;
+        }
         redir.m_out = NULL;
         redir.m_buf = NULL;
     }

diff --git a/test/unit/filters/MergeTest.cpp b/test/unit/filters/MergeTest.cpp
@@ -76,14 +76,14 @@ TEST(MergeTest, test6)
     mgr.setLog(log);
     mgr.readPipeline(Support::configuredpath("filters/merge3.json"));
 
-    std::ostringstream oss;
-    auto ctx = Utils::redirect(std::clog, oss);
-std::cerr << "Before execute!\n";
-    mgr.execute();
-std::cerr << "After execute!\n";
+    {
+        std::ostringstream oss;
+        auto ctx = Utils::redirect(std::clog, oss);
+        mgr.execute();
+        Utils::restore(std::clog, ctx);
+    }
 
 /**
-    Utils::restore(std::clog, ctx);
     std::string s = oss.str();
     EXPECT_TRUE(s.find("inconsistent spatial references") != s.npos);