address more Coverity warnings

Signed-off-by: Hans Zandbelt <[email protected]>
OpenIDC · Dec 15, 2024 · 6b9e982 · 6b9e982
1 parent 811ff97
commit 6b9e982
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/cache/redis.c b/src/cache/redis.c
@@ -534,7 +534,9 @@ static int oidc_cache_redis_destroy_impl(server_rec *s) {
 		oidc_cache_mutex_lock(s->process->pool, s, context->mutex);
 		context->disconnect(context);
 		oidc_cache_mutex_unlock(s->process->pool, s, context->mutex);
-		oidc_cache_mutex_destroy(s, context->mutex);
+		if (oidc_cache_mutex_destroy(s, context->mutex) != TRUE) {
+			oidc_serror(s, "oidc_cache_mutex_destroy on refresh mutex failed");
+		}
 		cfg->cache.cfg = NULL;
 	}
 

diff --git a/src/state.c b/src/state.c
@@ -143,7 +143,7 @@ static int oidc_state_cookies_delete_oldest(request_rec *r, oidc_cfg_t *c, int n
 			if (prev_oldest)
 				prev_oldest->next = oldest->next;
 			else
-				first = first ? first->next : NULL;
+				first = first->next;
 		}
 		number_of_valid_state_cookies--;
 	}

diff --git a/test/test-cmd.c b/test/test-cmd.c
@@ -317,8 +317,8 @@ static request_rec *request_setup(apr_pool_t *pool) {
 
 	oidc_dir_cfg_t *d_cfg = oidc_cfg_dir_config_create(request->pool, NULL);
 
-	request->server->module_config = apr_pcalloc(request->pool, sizeof(ap_conf_vector_t *) * kEls);
-	request->per_dir_config = apr_pcalloc(request->pool, sizeof(ap_conf_vector_t *) * kEls);
+	request->server->module_config = apr_pcalloc(request->pool, sizeof(void) * kEls);
+	request->per_dir_config = apr_pcalloc(request->pool, sizeof(void) * kEls);
 	ap_set_module_config(request->server->module_config, &auth_openidc_module, cfg);
 	ap_set_module_config(request->per_dir_config, &auth_openidc_module, d_cfg);
 
@@ -430,7 +430,7 @@ int uuid(int argc, char **argv, apr_pool_t *pool) {
 
 	if (argc > 2) {
 		n = _oidc_str_to_int(argv[2], n);
-		if ((n < 0) || (n > 25000000 * 10))
+		if (n > 25000000 * 10)
 			n = 25000000;
 	}
 

diff --git a/test/test.c b/test/test.c
@@ -1865,8 +1865,8 @@ static request_rec *test_setup(apr_pool_t *pool) {
 
 	oidc_dir_cfg_t *d_cfg = oidc_cfg_dir_config_create(request->pool, NULL);
 
-	request->server->module_config = apr_pcalloc(request->pool, sizeof(void *) * kEls);
-	request->per_dir_config = apr_pcalloc(request->pool, sizeof(void *) * kEls);
+	request->server->module_config = apr_pcalloc(request->pool, sizeof(void) * kEls);
+	request->per_dir_config = apr_pcalloc(request->pool, sizeof(void) * kEls);
 	ap_set_module_config(request->server->module_config, &auth_openidc_module, cfg);
 	ap_set_module_config(request->per_dir_config, &auth_openidc_module, d_cfg);