firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

RE2: Fix memory leaks when library is unloaded.

Browse Source 
Upstream discussion: https://code-review.googlesource.com/c/re2/+/59290
This commit is contained in:
Adriano dos Santos Fernandes 2021-10-05 11:24:08 -03:00
parent 5dfcaa4d32
commit 06c9df2c41
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
extern/re2/re2/re2.cc vendored
View File

@ -21,6 +21,7 @@
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <iterator> #include <iterator>
#include <memory>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <utility> #include <utility>
@ -60,9 +61,9 @@ RE2::Options::Options(RE2::CannedOptions opt)
// static empty objects for use as const references. // static empty objects for use as const references.
// To avoid global constructors, allocated in RE2::Init(). // To avoid global constructors, allocated in RE2::Init().
static const std::string* empty_string; static std::unique_ptr<const std::string> empty_string;
static const std::map<std::string, int>* empty_named_groups; static std::unique_ptr<const std::map<std::string, int>> empty_named_groups;
static const std::map<int, std::string>* empty_group_names; static std::unique_ptr<const std::map<int, std::string>> empty_group_names;
// Converts from Regexp error code to RE2 error code. // Converts from Regexp error code to RE2 error code.
// Maybe some day they will diverge. In any event, this // Maybe some day they will diverge. In any event, this
@ -173,15 +174,15 @@ int RE2::Options::ParseFlags() const {
void RE2::Init(const StringPiece& pattern, const Options& options) { void RE2::Init(const StringPiece& pattern, const Options& options) {
static std::once_flag empty_once; static std::once_flag empty_once;
std::call_once(empty_once, []() { std::call_once(empty_once, []() {
empty_string = new std::string; empty_string.reset(new std::string);
empty_named_groups = new std::map<std::string, int>; empty_named_groups.reset(new std::map<std::string, int>);
empty_group_names = new std::map<int, std::string>; empty_group_names.reset(new std::map<int, std::string>);
}); });
pattern_.assign(pattern.data(), pattern.size()); pattern_.assign(pattern.data(), pattern.size());
options_.Copy(options); options_.Copy(options);
entire_regexp_ = NULL; entire_regexp_ = NULL;
error_ = empty_string; error_ = empty_string.get();
error_code_ = NoError; error_code_ = NoError;
error_arg_.clear(); error_arg_.clear();
prefix_.clear(); prefix_.clear();
@ -267,11 +268,11 @@ RE2::~RE2() {
entire_regexp_->Decref(); entire_regexp_->Decref();
delete prog_; delete prog_;
delete rprog_; delete rprog_;
if (error_ != empty_string) if (error_ != empty_string.get())
delete error_; delete error_;
if (named_groups_ != NULL && named_groups_ != empty_named_groups) if (named_groups_ != NULL && named_groups_ != empty_named_groups.get())
delete named_groups_; delete named_groups_;
if (group_names_ != NULL && group_names_ != empty_group_names) if (group_names_ != NULL && group_names_ != empty_group_names.get())
delete group_names_; delete group_names_;
} }
@ -352,7 +353,7 @@ const std::map<std::string, int>& RE2::NamedCapturingGroups() const {
if (re->suffix_regexp_ != NULL) if (re->suffix_regexp_ != NULL)
re->named_groups_ = re->suffix_regexp_->NamedCaptures(); re->named_groups_ = re->suffix_regexp_->NamedCaptures();
if (re->named_groups_ == NULL) if (re->named_groups_ == NULL)
re->named_groups_ = empty_named_groups; re->named_groups_ = empty_named_groups.get();
}, this); }, this);
return *named_groups_; return *named_groups_;
} }
@ -363,7 +364,7 @@ const std::map<int, std::string>& RE2::CapturingGroupNames() const {
if (re->suffix_regexp_ != NULL) if (re->suffix_regexp_ != NULL)
re->group_names_ = re->suffix_regexp_->CaptureNames(); re->group_names_ = re->suffix_regexp_->CaptureNames();
if (re->group_names_ == NULL) if (re->group_names_ == NULL)
re->group_names_ = empty_group_names; re->group_names_ = empty_group_names.get();
}, this); }, this);
return *group_names_; return *group_names_;
} }