Merge pull request #69 from grimmy/ctype

Avoid undefined behavior with ctype functions

Author: QuLogic

COPYRIGHT

@@ -347,6 +347,7 @@ Brian Macke
 Paolo Maggi
 Sulabh Mahajan
 Willian T. Mahan
+Anthony Mallet
 Jonathan Maltz
 Rok Mandeljc
 Tobias Markmann

gg/lib/dcc.c

@@ -180,7 +180,7 @@ int gg_dcc_fill_file_info2(struct gg_dcc *d, const char *filename, const char *l
 		ext = name + strlen(name);
 
 	for (i = 0, p = name; i < 8 && p < ext; i++, p++)
-		d->file_info.short_filename[i] = toupper(name[i]);
+		d->file_info.short_filename[i] = toupper((unsigned char)name[i]);
 
 	if (i == 8 && p < ext) {
 		d->file_info.short_filename[6] = '~';
@@ -189,7 +189,7 @@ int gg_dcc_fill_file_info2(struct gg_dcc *d, const char *filename, const char *l
 
 	if (strlen(ext) > 0) {
 		for (j = 0; *ext && j < 4; j++, p++)
-			d->file_info.short_filename[i + j] = toupper(ext[j]);
+			d->file_info.short_filename[i + j] = toupper((unsigned char)ext[j]);
 	}
 
 	for (q = d->file_info.short_filename; *q; q++) {

gg/lib/events.c

@@ -874,7 +874,7 @@ static gg_action_t gg_handle_send_hub(struct gg_session *sess,
 	int proxy;
 	size_t req_len;
 
-	if (sess->client_version != NULL && isdigit(sess->client_version[0]))
+	if (sess->client_version != NULL && isdigit((unsigned char)sess->client_version[0]))
 		client = gg_urlencode(sess->client_version);
 	else if (sess->protocol_version <= GG_PROTOCOL_VERSION_100)
 		client = gg_urlencode(GG_DEFAULT_CLIENT_VERSION_100);

gg/lib/handlers.c

@@ -117,7 +117,7 @@ static int gg_session_handle_welcome_110(struct gg_session *gs, uint32_t seed,
 		return -1;
 	}
 
-	if (gs->client_version != NULL && !isdigit(gs->client_version[0])) {
+	if (gs->client_version != NULL && !isdigit((unsigned char)gs->client_version[0])) {
 		client_name = "";
 		client_target = "";
 	}
@@ -314,7 +314,7 @@ static int gg_session_handle_welcome(struct gg_session *gs, uint32_t type,
 	l80.image_size = gs->image_size;
 	l80.dunno2 = 0x64;
 
-	if (gs->client_version != NULL && !isdigit(gs->client_version[0])) {
+	if (gs->client_version != NULL && !isdigit((unsigned char)gs->client_version[0])) {
 		client_name = "";
 		client_name_len = 0;
 	} else {

gg/lib/message.c

@@ -694,7 +694,7 @@ size_t gg_message_html_to_text(char *dst, unsigned char *format,
 		*format_len = 0;
 
 	for (src = html; *src != 0; src++) {
-		if (in_entity && !(isalnum(*src) || *src == '#' || *src == ';')) {
+		if (in_entity && !(isalnum((unsigned char)*src) || *src == '#' || *src == ';')) {
 			int first = 1;
 			size_t i, append_len = src - entity;
 
@@ -738,7 +738,7 @@ size_t gg_message_html_to_text(char *dst, unsigned char *format,
 					int i, ok = 1;
 
 					for (i = 0; i < 16; i++) {
-						if (!isxdigit(tag[i])) {
+						if (!isxdigit((unsigned char)tag[i])) {
 							ok = 0;
 							break;
 						}
@@ -839,7 +839,7 @@ size_t gg_message_html_to_text(char *dst, unsigned char *format,
 								break;
 
 							for (i = 0; i < 6; i++) {
-								if (!isxdigit(tag[i])) {
+								if (!isxdigit((unsigned char)tag[i])) {
 									ok = 0;
 									break;
 								}
@@ -914,7 +914,7 @@ size_t gg_message_html_to_text(char *dst, unsigned char *format,
 			continue;
 		}
 
-		if (in_entity && !(isalnum(*src) || *src == '#'))
+		if (in_entity && !(isalnum((unsigned char)*src) || *src == '#'))
 			in_entity = 0;
 
 		if (in_entity)

novell/nmconn.c

@@ -512,7 +512,7 @@ nm_read_header(NMConn * conn)
 			ptr++;
 
 			i = 0;
-			while (isdigit(*ptr) && (i < 3)) {
+			while (isdigit((unsigned char)*ptr) && (i < 3)) {
 				rtn_buf[i] = *ptr;
 				i++;
 				ptr++;

zephyr/ZVariables.c

@@ -196,7 +196,7 @@ varline(char *bfr, char *var)
 	return (0);
 
     cp = bfr;
-    while (*cp && !isspace(*cp) && (*cp != '='))
+    while (*cp && !isspace((unsigned char)*cp) && (*cp != '='))
 	cp++;
 
 #ifndef WIN32
@@ -211,7 +211,7 @@ varline(char *bfr, char *var)
     if (!cp)
 	return(0);
     cp++;
-    while (*cp && isspace(*cp))		/* space up to variable value */
+    while (*cp && isspace((unsigned char)*cp))		/* space up to variable value */
 	cp++;
 
     return (cp - bfr);			/* return index */

zephyr/zephyr.c

@@ -630,7 +630,7 @@ static char *zephyr_to_html(const char *message)
 			message += 2;
 		} else if (*message == '@') {
 			int end;
-			for (end = 1; message[end] && (isalnum(message[end]) || message[end] == '_'); end++);
+			for (end = 1; message[end] && (isalnum((unsigned char)message[end]) || message[end] == '_'); end++);
 			if (message[end] &&
 			    (message[end] == '{' || message[end] == '[' || message[end] == '(' ||
 			     !g_ascii_strncasecmp(message + end, "<", 4))) {