protect initialization of LasReader stream from destruction (NITF dri…

…ver interaction
PDAL · Jun 11, 2015 · ea409a7 · ea409a7
1 parent 82a4ecb
commit ea409a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/io/las/LasReader.cpp b/io/las/LasReader.cpp
@@ -826,6 +826,7 @@ void LasReader::done(PointTableRef)
     m_unzipper.reset();
 #endif
     destroyStream();
+    m_initialized = false;
 }
 
 } // namespace pdal
diff --git a/io/las/LasReader.hpp b/io/las/LasReader.hpp
@@ -88,7 +88,14 @@ class PDAL_DLL LasReader : public pdal::Reader
         return m_istream;
     }
     virtual void destroyStream()
-        { FileUtils::closeFile(m_istream); m_istream = NULL; m_initialized = false; }
+        {
+            if (m_istream && m_initialized)
+            {
+                FileUtils::closeFile(m_istream);
+                m_istream = NULL;
+                m_initialized = false;
+            }
+        }
 private:
     LasError m_error;
     LasHeader m_lasHeader;