From 223ce91aeeb49e59590f4dcc295cacee48cb60c1 Mon Sep 17 00:00:00 2001
From: Ervin Hegedus <airween@gmail.com>
Date: Thu, 25 Jul 2024 20:52:55 +0200
Subject: [PATCH] Move xmlFree() call to the right place

---
 apache2/re_variables.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apache2/re_variables.c b/apache2/re_variables.c
index 5aa7589a2b..a080a863dd 100644
--- a/apache2/re_variables.c
+++ b/apache2/re_variables.c
@@ -745,13 +745,12 @@ static int var_xml_generate(modsec_rec *msr, msre_var *var, msre_rule *rule,
     }
 
     /* Create one variable for each node in the result. */
+    char* content = NULL;
     for(i = 0; i < nodes->nodeNr; i++) {
         msre_var *rvar = NULL;
-        char *content = NULL;
 
         content = (char *)xmlNodeGetContent(nodes->nodeTab[i]);
         if (content != NULL) {
-            xmlFree(content);
             rvar = apr_pmemdup(mptmp, var, sizeof(msre_var));
             if (!rvar) {
                 msr_log(msr, 1, "XML: Memory allocation error");
@@ -766,12 +765,15 @@ static int var_xml_generate(modsec_rec *msr, msre_var *var, msre_rule *rule,
             }
             rvar->value_len = strlen(rvar->value);
             apr_table_addn(vartab, rvar->name, (void *)rvar);
+            xmlFree(content);
+            content = NULL;
 
             count++;
          }
     }
 
 var_xml_generate_Error:
+    if (content != NULL) xmlFree(content);
     xmlXPathFreeObject(xpathObj);
     xmlXPathFreeContext(xpathCtx);