frontend,libobs,plugins: Ensure ctype functions use unsigned chars

Cast ctype function char parameters to unsigned char to ensure they are in correct range (0 to 255 vs -128 to 127) when used with utf-8 encoding (or extended ascii).

Fixes dstr astrcmp* functions when used with utf-8 (or extended ascii) characters, so now they are greater than the base ascii and thus sorted after them, not before.

Author: Dankirk

frontend/OBSApp_Themes.cpp

@@ -339,7 +339,7 @@ static vector<OBSThemeVariable> ParseThemeVariables(const char *themeData)
 
 			/* Look for a suffix and mark variable as size if it exists */
 			while (ch < end) {
-				if (!isdigit(*ch) && !isspace(*ch) && *ch != '.') {
+				if (!isdigit((unsigned char)*ch) && !isspace((unsigned char)*ch) && *ch != '.') {
 					var.suffix = QString::fromUtf8(ch, end - ch);
 					var.type = OBSThemeVariable::Size;
 					break;
@@ -526,14 +526,14 @@ static OBSThemeVariable ParseMathVariable(const QHash<QString, OBSThemeVariable>
 	const QByteArray utf8 = value.toUtf8();
 	const char *data = utf8.constData();
 
-	if (isdigit(*data)) {
+	if (isdigit((unsigned char)*data)) {
 		double f = os_strtod(data);
 		var.type = OBSThemeVariable::Number;
 		var.value = f;
 
 		const char *dataEnd = data + utf8.size();
 		while (data < dataEnd) {
-			if (*data && !isdigit(*data) && *data != '.') {
+			if (*data && !isdigit((unsigned char)*data) && *data != '.') {
 				var.suffix = QString::fromUtf8(data, dataEnd - data);
 				var.type = OBSThemeVariable::Size;
 				break;

libobs/util/cf-lexer.c

@@ -71,7 +71,7 @@ static inline void cf_convert_from_escape_literal(char **p_dst, const char **p_s
 
 	/* oct */
 	default:
-		if (isdigit(*src)) {
+		if (isdigit((unsigned char)*src)) {
 			*(dst++) = (char)strtoul(src, NULL, 8);
 			src += 3;
 		}

libobs/util/dstr.c

@@ -43,8 +43,8 @@ int astrcmpi(const char *str1, const char *str2)
 		str2 = astrblank;
 
 	do {
-		char ch1 = (char)toupper(*str1);
-		char ch2 = (char)toupper(*str2);
+		unsigned char ch1 = (unsigned char)toupper((unsigned char)*str1);
+		unsigned char ch2 = (unsigned char)toupper((unsigned char)*str2);
 
 		if (ch1 < ch2)
 			return -1;
@@ -85,8 +85,8 @@ int astrcmp_n(const char *str1, const char *str2, size_t n)
 		str2 = astrblank;
 
 	do {
-		char ch1 = *str1;
-		char ch2 = *str2;
+		unsigned char ch1 = (unsigned char)*str1;
+		unsigned char ch2 = (unsigned char)*str2;
 
 		if (ch1 < ch2)
 			return -1;
@@ -129,8 +129,8 @@ int astrcmpi_n(const char *str1, const char *str2, size_t n)
 		str2 = astrblank;
 
 	do {
-		char ch1 = (char)toupper(*str1);
-		char ch2 = (char)toupper(*str2);
+		unsigned char ch1 = (unsigned char)toupper((unsigned char)*str1);
+		unsigned char ch2 = (unsigned char)toupper((unsigned char)*str2);
 
 		if (ch1 < ch2)
 			return -1;

libobs/util/lexer.c

@@ -53,10 +53,10 @@ int strref_cmpi(const struct strref *str1, const char *str2)
 		str2 = astrblank;
 
 	do {
-		char ch1, ch2;
+		unsigned char ch1, ch2;
 
-		ch1 = (i < str1->len) ? (char)toupper(str1->array[i]) : 0;
-		ch2 = (char)toupper(*str2);
+		ch1 = (i < str1->len) ? (unsigned char)toupper((unsigned char)str1->array[i]) : 0;
+		ch2 = (unsigned char)toupper((unsigned char)*str2);
 
 		if (ch1 < ch2)
 			return -1;
@@ -77,7 +77,7 @@ int strref_cmp_strref(const struct strref *str1, const struct strref *str2)
 		return -1;
 
 	do {
-		char ch1, ch2;
+		unsigned char ch1, ch2;
 
 		ch1 = (i < str1->len) ? str1->array[i] : 0;
 		ch2 = (i < str2->len) ? str2->array[i] : 0;
@@ -103,10 +103,10 @@ int strref_cmpi_strref(const struct strref *str1, const struct strref *str2)
 		return -1;
 
 	do {
-		char ch1, ch2;
+		unsigned char ch1, ch2;
 
-		ch1 = (i < str1->len) ? (char)toupper(str1->array[i]) : 0;
-		ch2 = (i < str2->len) ? (char)toupper(str2->array[i]) : 0;
+		ch1 = (i < str1->len) ? (unsigned char)toupper((unsigned char)str1->array[i]) : 0;
+		ch2 = (i < str2->len) ? (unsigned char)toupper((unsigned char)str2->array[i]) : 0;
 
 		if (ch1 < ch2)
 			return -1;

plugins/text-freetype2/find-font.c

@@ -333,8 +333,8 @@ static inline size_t get_rating(struct font_path_info *info, struct dstr *cmp)
 	size_t num = 0;
 
 	do {
-		char ch1 = (char)toupper(*src);
-		char ch2 = (char)toupper(*dst);
+		unsigned char ch1 = (unsigned char)toupper((unsigned char)*src);
+		unsigned char ch2 = (unsigned char)toupper((unsigned char)*dst);
 
 		if (ch1 != ch2)
 			break;