oops: fix test and loop in oidc_util_utf8_to_latin1

Signed-off-by: Hans Zandbelt <[email protected]>
OpenIDC · Sep 19, 2023 · d05e76e · d05e76e
1 parent 3bcda42
commit d05e76e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/util.c b/src/util.c
@@ -2188,8 +2188,8 @@ static char* oidc_util_utf8_to_latin1(request_rec *r, const char *src) {
 	if (src == NULL)
 		return NULL;
 	dst = apr_pcalloc(r->pool, strlen(src) + 1);
-	while (src[i] != '\0') {
-		ch = (unsigned char) (src[i]);
+	while (*src != '\0') {
+		ch = (unsigned char) (*src);
 		if (ch <= 0x7f)
 			cp = ch;
 		else if (ch <= 0xbf)
@@ -2200,15 +2200,16 @@ static char* oidc_util_utf8_to_latin1(request_rec *r, const char *src) {
 			cp = ch & 0x0f;
 		else
 			cp = ch & 0x07;
-		if (((src[i + 1] & 0xc0) != 0x80) && (cp <= 0x10ffff)) {
+		++src;
+		if (((*src & 0xc0) != 0x80) && (cp <= 0x10ffff)) {
 			if (cp <= 255) {
 				dst[i] = (unsigned char) cp;
 			} else {
 				// no encoding possible
 				dst[i] = '?';
 			}
+			i++;
 		}
-		i++;
 	}
 	dst[i] = '\0';
 	return dst;