pgbackrest.git / summary / log / commit / refs

commit    e8c40a24df14fcf281de672c19d0a55dc7cb50f6
Author:   David Steele <david@pgmasters.net>
Date:     Mon May 09 13:56:19 2022 +0000

    Remove unnecessary TRY() block in common/regExp module.
    
    This code was written before MEM_CONTEXT_TEMP*() was available, which is a better solution.


 doc/xml/release.xml |  5 ++++-
 src/common/regExp.c | 13 ++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 254772c8e..73808c2ff 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -18,7 +18,10 @@
             <release-core-list>
                 <release-bug-list>
                     <release-item>
-                        <github-pull-request id="1732"/>
+                        <commit subject="Fix error thrown from FINALLY() causing an infinite loop.">
+                            <github-pull-request id="1732"/>
+                        </commit>
+                        <commit subject="Remove unnecessary TRY() block in common/regExp module."/>
 
                         <release-item-contributor-list>
                             <release-item-contributor id="david.steele"/>
diff --git a/src/common/regExp.c b/src/common/regExp.c
index a9ac02cdd..d06549e48 100644
--- a/src/common/regExp.c
+++ b/src/common/regExp.c
@@ -179,18 +179,13 @@ regExpMatchOne(const String *expression, const String *string)
     ASSERT(expression != NULL);
     ASSERT(string != NULL);
 
-    bool result = false;
-    RegExp *regExp = regExpNew(expression);
+    bool result;
 
-    TRY_BEGIN()
+    MEM_CONTEXT_TEMP_BEGIN()
     {
-        result = regExpMatch(regExp, string);
+        result = regExpMatch(regExpNew(expression), string);
     }
-    FINALLY()
-    {
-        regExpFree(regExp);
-    }
-    TRY_END();
+    MEM_CONTEXT_TEMP_END();
 
     FUNCTION_TEST_RETURN(BOOL, result);
 }


[parent: 4d8c36715ddd]