fix compiler warning when passing empty string to oidc_util_html_escape

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

Author: zandbelt

ChangeLog

@@ -1,3 +1,8 @@
+09/13/2025
+- redis: apply global (server-wide) locking when system(!) environment variable
+  OIDC_REDIS_MUTEX_GLOBAL is set, for backwards compatibility, through:
+  PassEnv OIDC_REDIS_MUTEX_GLOBAL
+
 09/12/2025
 - test: add util/*.c coverage tests
 

src/cache/redis.c

@@ -46,16 +46,16 @@
 #include "cache/redis.h"
 #include "cfg/cfg_int.h"
 
-// TODO: proper Redis error reporting (server unreachable etc.)
-
 #define REDIS_CONNECT_TIMEOUT_DEFAULT 5
 #define REDIS_TIMEOUT_DEFAULT 5
 #define REDIS_KEEPALIVE_DEFAULT -1
 
+#define OIDC_REDIS_MUTEX_GLOBAL_ENV_VAR "OIDC_REDIS_MUTEX_GLOBAL"
+
 /* create the cache context */
 static oidc_cache_cfg_redis_t *oidc_cache_redis_cfg_create(apr_pool_t *pool) {
 	oidc_cache_cfg_redis_t *context = apr_pcalloc(pool, sizeof(oidc_cache_cfg_redis_t));
-	context->mutex = oidc_cache_mutex_create(pool, FALSE);
+	context->mutex = oidc_cache_mutex_create(pool, getenv(OIDC_REDIS_MUTEX_GLOBAL_ENV_VAR) ? TRUE : FALSE);
 	context->username = NULL;
 	context->passwd = NULL;
 	context->database = -1;

src/util/html.c

@@ -61,7 +61,7 @@ char *oidc_util_html_escape(apr_pool_t *pool, const char *s) {
 	unsigned int m = 0;
 	const char *ptr = chars;
 	unsigned int len = _oidc_strlen(ptr);
-	char *r = apr_pcalloc(pool, _oidc_strlen(s) * 6);
+	char *r = apr_pcalloc(pool, _oidc_strlen(s) * 6 + 1);
 	for (i = 0; i < _oidc_strlen(s); i++) {
 		for (n = 0; n < len; n++) {
 			if (s[i] == chars[n]) {