From f7fa00aadfabdbff23cecdc28cbb229f5f65f72a Mon Sep 17 00:00:00 2001
From: Martin Vierula <martin.vierula@trustwave.com>
Date: Sun, 20 Nov 2022 10:39:04 -0800
Subject: [PATCH] Fix: handle error with SecConnReadStateLimit configuration

---
 CHANGES                  | 2 ++
 apache2/apache2_config.c | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES b/CHANGES
index 6074a4f5..a06b9055 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 DD mmm YYYY - 2.9.x (to be released)
 -------------------
 
+ * Fix: handle error with SecConnReadStateLimit configuration
+   [Issue #2815, #2834 - @marcstern, @martinhsv]
  * Only check for pcre2 install if required
    [Issue #2833 - @martinhsv]
  * Adjustment of previous fix for log messages
diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c
index 69612f95..0758e235 100644
--- a/apache2/apache2_config.c
+++ b/apache2/apache2_config.c
@@ -1732,6 +1732,12 @@ char *parser_conn_limits_operator(apr_pool_t *mp, const char *p2,
     char *param = strchr(p2, ' ');
     char *file = NULL;
     char *error_msg = NULL;
+
+    if (param == NULL) {
+        return apr_psprintf(mp, "ModSecurity: Space character between operator " \
+           "and parameter not found with ConnReadStateLimit: %s", p2);
+    }
+
     param++;
 
     config_orig_path = apr_pstrndup(mp, filename,