blob: ab2174f04ff08ad27272d6d7e7f0f244ec7ed845 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
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.
|
