You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.6 KiB
56 lines
1.6 KiB
5 years ago
|
From 09d45518776489508f34098f1c159f58b856f459 Mon Sep 17 00:00:00 2001
|
||
|
From: Mateusz Loskot <mateusz@loskot.net>
|
||
|
Date: Sun, 20 Jan 2019 02:28:29 +0100
|
||
|
Subject: [PATCH] Ensure stream is deallocated in case of exception (#162)
|
||
|
|
||
|
Fixes #158
|
||
|
---
|
||
|
include/liblas/liblas.hpp | 32 ++++++++++++++++++++++++--------
|
||
|
1 file changed, 24 insertions(+), 8 deletions(-)
|
||
|
|
||
|
diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp
|
||
|
index f5ad44e1..325de3ff 100644
|
||
|
--- a/include/liblas/liblas.hpp
|
||
|
+++ b/include/liblas/liblas.hpp
|
||
|
@@ -119,16 +119,32 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode)
|
||
|
{
|
||
|
#ifdef USE_BOOST_IO
|
||
|
namespace io = boost::iostreams;
|
||
|
- io::stream<io::file_source>* ifs = new io::stream<io::file_source>();
|
||
|
- ifs->open(filename.c_str(), mode);
|
||
|
- if (ifs->is_open() == false) return NULL;
|
||
|
- return ifs;
|
||
|
+ io::stream<io::file_source>* ifs = NULL;
|
||
|
+ try
|
||
|
+ {
|
||
|
+ ifs = new io::stream<io::file_source>();
|
||
|
+ ifs->open(filename.c_str(), mode);
|
||
|
+ if (ifs->is_open() == false) return NULL;
|
||
|
+ return ifs;
|
||
|
+ }
|
||
|
+ catch (...)
|
||
|
+ {
|
||
|
+ delete ifs;
|
||
|
+ }
|
||
|
#else
|
||
|
- std::ifstream* ifs = new std::ifstream();
|
||
|
- ifs->open(filename.c_str(), mode);
|
||
|
- if (ifs->is_open() == false) return NULL;
|
||
|
- return ifs;
|
||
|
+ std::ifstream* ifs = NULL;
|
||
|
+ try
|
||
|
+ {
|
||
|
+ ifs = new std::ifstream();
|
||
|
+ ifs->open(filename.c_str(), mode);
|
||
|
+ if (ifs->is_open() == false) return NULL;
|
||
|
+ }
|
||
|
+ catch (...)
|
||
|
+ {
|
||
|
+ delete ifs;
|
||
|
+ }
|
||
|
#endif
|
||
|
+ return NULL;
|
||
|
}
|
||
|
|
||
|
/// Create file and open to write in binary mode.
|