gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 06:37:10 -08:00
Code Issues Projects Releases Wiki Activity

sci-geosciences/liblas: Fix CVE-2018-20540

Browse Source 
Bug: https://bugs.gentoo.org/678482
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2019-05-24 21:25:47 +02:00
parent 0a0b83a051
commit 876f39a654
2 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch
+55
View File
@@ -0,0 +1,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.
sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
+1
View File
@@ -30,6 +30,7 @@ S="${WORKDIR}/libLAS-${PV}"
PATCHES=(
"${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
"${FILESDIR}"/${P}-fix-overload-call.patch # bug 661654
"${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
)
src_prepare() {