Skip to content

Commit 6b9e982

Browse files
committed
address more Coverity warnings
Signed-off-by: Hans Zandbelt <[email protected]>
1 parent 811ff97 commit 6b9e982

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/cache/redis.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,9 @@ static int oidc_cache_redis_destroy_impl(server_rec *s) {
534534
oidc_cache_mutex_lock(s->process->pool, s, context->mutex);
535535
context->disconnect(context);
536536
oidc_cache_mutex_unlock(s->process->pool, s, context->mutex);
537-
oidc_cache_mutex_destroy(s, context->mutex);
537+
if (oidc_cache_mutex_destroy(s, context->mutex) != TRUE) {
538+
oidc_serror(s, "oidc_cache_mutex_destroy on refresh mutex failed");
539+
}
538540
cfg->cache.cfg = NULL;
539541
}
540542

src/state.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static int oidc_state_cookies_delete_oldest(request_rec *r, oidc_cfg_t *c, int n
143143
if (prev_oldest)
144144
prev_oldest->next = oldest->next;
145145
else
146-
first = first ? first->next : NULL;
146+
first = first->next;
147147
}
148148
number_of_valid_state_cookies--;
149149
}

test/test-cmd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ static request_rec *request_setup(apr_pool_t *pool) {
317317

318318
oidc_dir_cfg_t *d_cfg = oidc_cfg_dir_config_create(request->pool, NULL);
319319

320-
request->server->module_config = apr_pcalloc(request->pool, sizeof(ap_conf_vector_t *) * kEls);
321-
request->per_dir_config = apr_pcalloc(request->pool, sizeof(ap_conf_vector_t *) * kEls);
320+
request->server->module_config = apr_pcalloc(request->pool, sizeof(void) * kEls);
321+
request->per_dir_config = apr_pcalloc(request->pool, sizeof(void) * kEls);
322322
ap_set_module_config(request->server->module_config, &auth_openidc_module, cfg);
323323
ap_set_module_config(request->per_dir_config, &auth_openidc_module, d_cfg);
324324

@@ -430,7 +430,7 @@ int uuid(int argc, char **argv, apr_pool_t *pool) {
430430

431431
if (argc > 2) {
432432
n = _oidc_str_to_int(argv[2], n);
433-
if ((n < 0) || (n > 25000000 * 10))
433+
if (n > 25000000 * 10)
434434
n = 25000000;
435435
}
436436

test/test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,8 +1865,8 @@ static request_rec *test_setup(apr_pool_t *pool) {
18651865

18661866
oidc_dir_cfg_t *d_cfg = oidc_cfg_dir_config_create(request->pool, NULL);
18671867

1868-
request->server->module_config = apr_pcalloc(request->pool, sizeof(void *) * kEls);
1869-
request->per_dir_config = apr_pcalloc(request->pool, sizeof(void *) * kEls);
1868+
request->server->module_config = apr_pcalloc(request->pool, sizeof(void) * kEls);
1869+
request->per_dir_config = apr_pcalloc(request->pool, sizeof(void) * kEls);
18701870
ap_set_module_config(request->server->module_config, &auth_openidc_module, cfg);
18711871
ap_set_module_config(request->per_dir_config, &auth_openidc_module, d_cfg);
18721872

0 commit comments

Comments
 (0)