From 3e6956767ee5da8a9a00453ab32d3e5c322c761a Mon Sep 17 00:00:00 2001 From: ylavic Date: Sat, 1 Dec 2018 23:36:45 +0100 Subject: [PATCH] Fix a memory leak for invalid std::regex in Schema. --- include/rapidjson/schema.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/rapidjson/schema.h b/include/rapidjson/schema.h index fa0d696..57ec797 100644 --- a/include/rapidjson/schema.h +++ b/include/rapidjson/schema.h @@ -1150,10 +1150,12 @@ private: template RegexType* CreatePattern(const ValueType& value) { if (value.IsString()) + RegexType *r = static_cast(allocator_->Malloc(sizeof(RegexType))); try { - return new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript); + return new (r) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript); } catch (const std::regex_error&) { + AllocatorType::Free(r); } return 0; }