From 046d3eb3ec42d8f27d42eaa0a433f7b6d5db4b07 Mon Sep 17 00:00:00 2001
From: Marc Stern <marc.stern@approach-cyber.com>
Date: Mon, 19 Aug 2024 14:19:05 +0200
Subject: [PATCH] Fixed two error messages

---
 apache2/re.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/apache2/re.c b/apache2/re.c
index 6b2753e0..be6a9187 100644
--- a/apache2/re.c
+++ b/apache2/re.c
@@ -333,14 +333,8 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
                 if (match == 1)  {
                     rc = msre_parse_targets(ruleset, p, rule->targets, &my_error_msg);
                     if (rc < 0) {
-                        if (msr) {
-                            msr_log(msr, 9, "Error parsing rule targets to replace variable");
-                        }
-#if !defined(MSC_TEST)
-                        else {
-                            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Error parsing rule targets to replace variable");
-                        }
-#endif
+                        if (my_error_msg) my_error_msg = apr_psprintf(ruleset->mp, "Error parsing rule targets to replace variable: %s", my_error_msg);
+                        else my_error_msg = apr_psprintf(ruleset->mp, "Error parsing rule targets to replace variable");
                         goto end;
                     }
                     if (msr) {
@@ -354,14 +348,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
                 var_appended = 1;
 
                 } else  {
-                    if (msr) {
-                        msr_log(msr, 9, "Cannot find variable to replace");
-                    }
-#if !defined(MSC_TEST)
-                    else {
-                        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Cannot find variable to replace");
-                    }
-#endif
+                    my_error_msg = apr_psprintf(ruleset->mp, "Cannot find variable to replace");
                     goto end;
                 }
             }
@@ -445,14 +432,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
                 if (match == 0 ) {
                     rc = msre_parse_targets(ruleset, p, rule->targets, &my_error_msg);
                     if (rc < 0) {
-                        if (msr) {
-                            msr_log(msr, 9, "Error parsing rule targets to append variable");
-                        }
-#if !defined(MSC_TEST)
-                        else {
-                            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Error parsing rule targets to append variable");
-                        }
-#endif
+                        my_error_msg = apr_psprintf(ruleset->mp, "Error parsing rule targets to append variable");
                         goto end;
                     }
                     var_appended = 1;