Avoid last loop and storing an empty value in case nothing after last %{..} macro

Marc Stern · Marc Stern · commit 608cd1d09dc6 · 2023-10-26T14:21:32.000+02:00
diff --git a/apache2/re_actions.c b/apache2/re_actions.c
@@ -279,7 +279,7 @@ int expand_macros(modsec_rec *msr, msc_string *var, msre_rule *rule, apr_pool_t
             part->value_len = strlen(part->value);
             *(msc_string **)apr_array_push(arr) = part;
         }
-    } while (p != NULL);
+    } while (p != NULL && *next_text_start);
 
     /* If there's more than one member of the array that
      * means there was at least one macro present. Combine

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ int expand_macros(modsec_rec msr, msc_string var, msre_rule *rule, apr_pool_t`
`279`	`279`	`part->value_len = strlen(part->value);`
`280`	`280`	`(msc_string *)apr_array_push(arr) = part;`
`281`	`281`	`}`
`282`		`- } while (p != NULL);`
	`282`	`+ } while (p != NULL && *next_text_start);`
`283`	`283`
`284`	`284`	`/* If there's more than one member of the array that`
`285`	`285`	`* means there was at least one macro present. Combine`