Merge pull request #430 from bazsi/filterx-avoid-excessive-memset-in-regexp-common

bshifter · web-flow · commit 6fe8d735cd54 · 2025-01-06T08:53:34.000+01:00
filterx/expr-regexp-common: avoid excessive zero initialization of FilterXReMatchState
diff --git a/lib/filterx/expr-regexp-common.c b/lib/filterx/expr-regexp-common.c
@@ -69,7 +69,8 @@ filterx_regexp_compile_pattern_defaults(const gchar *pattern)
 void
 filterx_expr_rematch_state_init(FilterXReMatchState *state)
 {
-  memset(state, 0, sizeof(FilterXReMatchState));
+  state->match_data = NULL;
+  state->lhs_obj = NULL;
 }
 
 void
@@ -78,7 +79,6 @@ filterx_expr_rematch_state_cleanup(FilterXReMatchState *state)
   if (state->match_data)
     pcre2_match_data_free(state->match_data);
   filterx_object_unref(state->lhs_obj);
-  memset(state, 0, sizeof(FilterXReMatchState));
 }
 
 gboolean

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ filterx_regexp_compile_pattern_defaults(const gchar *pattern)`
`69`	`69`	`void`
`70`	`70`	`filterx_expr_rematch_state_init(FilterXReMatchState *state)`
`71`	`71`	`{`
`72`		`- memset(state, 0, sizeof(FilterXReMatchState));`
	`72`	`+ state->match_data = NULL;`
	`73`	`+ state->lhs_obj = NULL;`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`void`
`@@ -78,7 +79,6 @@ filterx_expr_rematch_state_cleanup(FilterXReMatchState *state)`
`78`	`79`	`if (state->match_data)`
`79`	`80`	`pcre2_match_data_free(state->match_data);`
`80`	`81`	`filterx_object_unref(state->lhs_obj);`
`81`		`- memset(state, 0, sizeof(FilterXReMatchState));`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`gboolean`