From 56d69ef8ca1f2826b1e7c620b871f5074926a43a Mon Sep 17 00:00:00 2001 From: Jorge Gorbe Moya Date: Thu, 23 May 2019 20:11:17 +0000 Subject: [PATCH] [lldb] Make sure RegularExpression constructors always initialize member variables The copy constructor of RegularExpression doesn't initialize m_comp_err. This causes an use-of-initialized-value error when a RegularExpression is copied: the copy constructor calls Compile, which calls Free to free the existing regex if needed, which in turn reads m_comp_err to check if there's any regex to be freed. This change calls the default constructor from the other constructors to make sure members are always initialized with sensible values. This also avoids duplicating init logic, like the RegularExpression(llvm:StringRef) constructor does, which is error prone. Differential Revision: https://reviews.llvm.org/D62334 llvm-svn: 361546 --- lldb/source/Utility/RegularExpression.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lldb/source/Utility/RegularExpression.cpp b/lldb/source/Utility/RegularExpression.cpp index 71fe301..0192e8b 100644 --- a/lldb/source/Utility/RegularExpression.cpp +++ b/lldb/source/Utility/RegularExpression.cpp @@ -29,13 +29,12 @@ RegularExpression::RegularExpression() : m_re(), m_comp_err(1), m_preg() { // Constructor that compiles "re" using "flags" and stores the resulting // compiled regular expression into this object. RegularExpression::RegularExpression(llvm::StringRef str) - : m_re(), m_comp_err(1), m_preg() { - memset(&m_preg, 0, sizeof(m_preg)); + : RegularExpression() { Compile(str); } -RegularExpression::RegularExpression(const RegularExpression &rhs) { - memset(&m_preg, 0, sizeof(m_preg)); +RegularExpression::RegularExpression(const RegularExpression &rhs) + : RegularExpression() { Compile(rhs.GetText()); } -- 2.7.4