QuasarApp/LIEF
4
0
Fork 0
mirror of https://github.com/QuasarApp/LIEF.git synced 2025-04-27 04:44:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #426 from kohnakagawa/fix/segfault_gil_release

Browse Source 
improve #400
This commit is contained in:
Romain 2020-06-06 06:43:35 +02:00 committed by GitHub
commit ddc8b72e6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
api/python/Abstract/objects/pyParser.cpp
View File

@ -18,6 +18,7 @@
#include "LIEF/Abstract/Parser.hpp"
#include <string>
#include <stdexcept>
namespace LIEF {
template<>
@ -31,9 +32,15 @@ void create<Parser>(py::module& m) {
std::make_move_iterator(std::end(raw_str))
};
std::unique_ptr<Binary> binary;
std::exception_ptr ep;
Py_BEGIN_ALLOW_THREADS
binary = Parser::parse(std::move(raw), name);
try {
binary = Parser::parse(std::move(raw), name);
} catch (...) {
ep = std::current_exception();
}
Py_END_ALLOW_THREADS
if (ep) std::rethrow_exception(ep);
return binary;
},
"Parse the given binary and return a " RST_CLASS_REF(lief.Binary) " object",
@ -43,9 +50,15 @@ void create<Parser>(py::module& m) {
m.def("parse",
[] (const std::string& name) {
std::unique_ptr<Binary> binary;
std::exception_ptr ep;
Py_BEGIN_ALLOW_THREADS
binary = Parser::parse(name);
try {
binary = Parser::parse(name);
} catch (...) {
ep = std::current_exception();
}
Py_END_ALLOW_THREADS
if (ep) std::rethrow_exception(ep);
return binary;
},
"Parse the given binary and return a " RST_CLASS_REF(lief.Binary) " object",
@ -55,9 +68,15 @@ void create<Parser>(py::module& m) {
m.def("parse",
[](const std::vector<uint8_t>& raw, const std::string& name) {
std::unique_ptr<Binary> binary;
std::exception_ptr ep;
Py_BEGIN_ALLOW_THREADS
binary = Parser::parse(raw, name);
try {
binary = Parser::parse(raw, name);
} catch (...) {
ep = std::current_exception();
}
Py_END_ALLOW_THREADS
if (ep) std::rethrow_exception(ep);
return binary;
},
"Parse the given binary and return a " RST_CLASS_REF(lief.Binary) " object",
@ -99,9 +118,15 @@ void create<Parser>(py::module& m) {
};
std::unique_ptr<Binary> binary;
std::exception_ptr ep;
Py_BEGIN_ALLOW_THREADS
binary = Parser::parse(std::move(raw), name);
try {
binary = Parser::parse(std::move(raw), name);
} catch (...) {
ep = std::current_exception();
}
Py_END_ALLOW_THREADS
if (ep) std::rethrow_exception(ep);
return binary;
},
"io"_a,