code: loop over authz arrays with index instead of pointer

Signed-off-by: Hans Zandbelt <[email protected]>

Author: zandbelt

ChangeLog

@@ -1,3 +1,6 @@
+12/11/2024
+- code: loop over authz arrays with index instead of pointer
+
 12/10/2024
 - github: add SonarQube analysis to Github workflows
 - code: use snprintf instead of sprintf

src/handle/authz.c

@@ -196,10 +196,11 @@ static apr_byte_t oidc_authz_match_pcre_array(request_rec *r, const char *spec,
 					      struct oidc_pcre *);
 
 // clang-format off
+#define OIDC_AUTHZ_PCRE_HANDLERS_NUMBER 2
+
 static oidc_authz_pcre_handler_t _oidc_authz_pcre_handlers[] = {
 	{ JSON_ARRAY, oidc_authz_match_pcre_array },
-	{ JSON_STRING, oidc_authz_match_pcre_string },
-	{ 0, NULL}
+	{ JSON_STRING, oidc_authz_match_pcre_string }
 };
 // clang-format on
 
@@ -237,7 +238,7 @@ static apr_byte_t oidc_authz_match_pcre(request_rec *r, const char *spec, json_t
 	apr_byte_t rc = FALSE;
 	struct oidc_pcre *preg = NULL;
 	char *s_err = NULL;
-	oidc_authz_pcre_handler_t *h = NULL;
+	int i = 0;
 
 	if ((spec == NULL) || (val == NULL) || (key == NULL))
 		return FALSE;
@@ -249,17 +250,17 @@ static apr_byte_t oidc_authz_match_pcre(request_rec *r, const char *spec, json_t
 	}
 
 	// loop over the JSON object PCRE handlers
-	for (h = _oidc_authz_pcre_handlers; h->handler; h++) {
-		if (h->type == json_typeof(val)) {
+	for (i = 0; i < OIDC_AUTHZ_PCRE_HANDLERS_NUMBER; i++) {
+		if (_oidc_authz_pcre_handlers[i].type == json_typeof(val)) {
 			// break out of the loop because we found a handler, and possibly a match
-			if (h->handler(r, spec, val, key, preg) == TRUE)
+			if (_oidc_authz_pcre_handlers[i].handler(r, spec, val, key, preg) == TRUE)
 				rc = TRUE;
 			break;
 		}
 	}
 
 	// see if we have found an object handler
-	if (h->handler == NULL)
+	if (i == OIDC_AUTHZ_PCRE_HANDLERS_NUMBER)
 		oidc_warn(r, "unhandled JSON object type [%d] for key \"%s\"", json_typeof(val), key);
 
 	oidc_pcre_free(preg);
@@ -282,25 +283,27 @@ static apr_byte_t oidc_authz_separator_dot(request_rec *r, const char *spec, jso
 }
 
 // clang-format off
+
+#define OIDC_AUTHZ_SEPARATOR_HANDLERS_NUMBER 3
+
 static oidc_authz_json_handler_t _oidc_authz_separator_handlers[] = {
 		// there's some overloading going on here, applying a char as an int index
 	{ OIDC_CHAR_COLON, oidc_authz_match_value },
 	{ OIDC_CHAR_TILDE, oidc_authz_match_pcre },
-	{ OIDC_CHAR_DOT, oidc_authz_separator_dot },
-	{ 0, NULL}
+	{ OIDC_CHAR_DOT, oidc_authz_separator_dot }
 };
 // clang-format on
 
 static apr_byte_t oidc_auth_handle_separator(request_rec *r, const char *key, json_t *val, const char *spec) {
-	oidc_authz_json_handler_t *h = NULL;
+	int i = 0;
 	if ((spec == NULL) || (val == NULL) || (key == NULL))
 		return FALSE;
-	for (h = _oidc_authz_separator_handlers; h->handler; h++) {
+	for (i = 0; i < OIDC_AUTHZ_SEPARATOR_HANDLERS_NUMBER; i++) {
 		// there's some overloading going on here, applying a char as an int index
-		if (h->type == (*spec)) {
+		if (_oidc_authz_separator_handlers[i].type == (*spec)) {
 			// skip the separator
 			spec++;
-			if (h->handler(r, spec, val, key) == TRUE)
+			if (_oidc_authz_separator_handlers[i].handler(r, spec, val, key) == TRUE)
 				return TRUE;
 		}
 	}