protect against multiple initialize() calls leaking streams

PDAL · Jun 5, 2015 · c620ac3 · c620ac3
1 parent 7a88142
commit c620ac3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/io/las/LasReader.cpp b/io/las/LasReader.cpp
@@ -141,6 +141,7 @@ QuickInfo LasReader::inspect()
 
 void LasReader::initialize()
 {
+    if (m_initialized) return;
     m_istream = createStream();
 
     m_istream->seekg(0);
@@ -177,6 +178,7 @@ void LasReader::initialize()
         readExtraBytesVlr();
     }
     fixupVlrs();
+    m_initialized = true;
 }
 
 

diff --git a/io/las/LasReader.hpp b/io/las/LasReader.hpp
@@ -57,7 +57,7 @@ class PDAL_DLL LasReader : public pdal::Reader
 {
     friend class NitfReader;
 public:
-    LasReader() : pdal::Reader(), m_index(0), m_istream(NULL)
+    LasReader() : pdal::Reader(), m_index(0), m_istream(NULL), m_initialized(false)
         {}
 
     virtual ~LasReader()
@@ -78,6 +78,13 @@ class PDAL_DLL LasReader : public pdal::Reader
     virtual std::istream *createStream()
     {
         m_istream = FileUtils::openFile(m_filename);
+        if (!m_istream)
+        {
+            std::ostringstream oss;
+            oss << "Unable to create open stream for '"
+                << m_filename <<"' with error '" << strerror(errno) <<"'";
+            throw pdal_error(oss.str());
+        }
         return m_istream;
     }
     virtual void destroyStream()
@@ -122,6 +129,7 @@ class PDAL_DLL LasReader : public pdal::Reader
 
     LasReader& operator=(const LasReader&); // not implemented
     LasReader(const LasReader&); // not implemented
+    bool m_initialized;
 };
 
 } // namespace pdal