Merge pull request #3187 from marcstern/v2/pr/logidptr

airween · web-flow · commit df79bf684326 · 2024-07-30T16:25:54.000+02:00
Invalid pointer access in case rule id == NOT_SET_P
diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c
@@ -35,7 +35,7 @@ const char* id_log(msre_rule* rule) {
     assert(rule != NULL);
     assert(rule->actionset != NULL);
     const char* id = rule->actionset->id;
-    if (!id || !*id || id == NOT_SET_P) id = apr_psprintf(rule->ruleset->mp, "%s (%d)", rule->filename, rule->line_num);
+    if (!id || id == NOT_SET_P || !*id) id = apr_psprintf(rule->ruleset->mp, "%s (%d)", rule->filename, rule->line_num);
 	return id;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ const char* id_log(msre_rule* rule) {`
`35`	`35`	`assert(rule != NULL);`
`36`	`36`	`assert(rule->actionset != NULL);`
`37`	`37`	`const char* id = rule->actionset->id;`
`38`		`- if (!id \|\| !*id \|\| id == NOT_SET_P) id = apr_psprintf(rule->ruleset->mp, "%s (%d)", rule->filename, rule->line_num);`
	`38`	`+ if (!id \|\| id == NOT_SET_P \|\| !*id) id = apr_psprintf(rule->ruleset->mp, "%s (%d)", rule->filename, rule->line_num);`
`39`	`39`	`return id;`
`40`	`40`	`}`
`41`	`41`