Fix shift ub in mbstring

Ideally "c" would be an unsigned integer...

Author: nikic

ext/mbstring/libmbfl/filters/mbfilter_ucs4.c

@@ -139,7 +139,7 @@ int mbfl_filt_conv_ucs4_wchar(int c, mbfl_convert_filter *filter)
 		if (endian) {
 			n = c & 0xff;
 		} else {
-			n = (c & 0xff) << 24;
+			n = (c & 0xffu) << 24;
 		}
 		filter->cache = n;
 		filter->status++;
@@ -164,7 +164,7 @@ int mbfl_filt_conv_ucs4_wchar(int c, mbfl_convert_filter *filter)
 		break;
 	default:
 		if (endian) {
-			n = (c & 0xff) << 24;
+			n = (c & 0xffu) << 24;
 		} else {
 			n = c & 0xff;
 		}
@@ -195,7 +195,7 @@ int mbfl_filt_conv_ucs4be_wchar(int c, mbfl_convert_filter *filter)
 
 	if (filter->status == 0) {
 		filter->status = 1;
-		n = (c & 0xff) << 24;
+		n = (c & 0xffu) << 24;
 		filter->cache = n;
 	} else if (filter->status == 1) {
 		filter->status = 2;
@@ -251,7 +251,7 @@ int mbfl_filt_conv_ucs4le_wchar(int c, mbfl_convert_filter *filter)
 		filter->cache |= n;
 	} else {
 		filter->status = 0;
-		n = ((c & 0xff) << 24) | filter->cache;
+		n = ((c & 0xffu) << 24) | filter->cache;
 		CK((*filter->output_function)(n, filter->data));
 	}
 	return c;

ext/mbstring/libmbfl/filters/mbfilter_utf32.c

@@ -138,7 +138,7 @@ int mbfl_filt_conv_utf32_wchar(int c, mbfl_convert_filter *filter)
 		if (endian) {
 			n = c & 0xff;
 		} else {
-			n = (unsigned) (c & 0xff) << 24;
+			n = (c & 0xffu) << 24;
 		}
 		filter->cache = n;
 		filter->status++;
@@ -163,7 +163,7 @@ int mbfl_filt_conv_utf32_wchar(int c, mbfl_convert_filter *filter)
 		break;
 	default:
 		if (endian) {
-			n = (c & 0xff) << 24;
+			n = (c & 0xffu) << 24;
 		} else {
 			n = c & 0xff;
 		}
@@ -199,7 +199,7 @@ int mbfl_filt_conv_utf32be_wchar(int c, mbfl_convert_filter *filter)
 
 	if (filter->status == 0) {
 		filter->status = 1;
-		n = (c & 0xff) << 24;
+		n = (c & 0xffu) << 24;
 		filter->cache = n;
 	} else if (filter->status == 1) {
 		filter->status = 2;
@@ -260,7 +260,7 @@ int mbfl_filt_conv_utf32le_wchar(int c, mbfl_convert_filter *filter)
 		filter->cache |= n;
 	} else {
 		filter->status = 0;
-		n = ((c & 0xff) << 24) | filter->cache;
+		n = ((c & 0xffu) << 24) | filter->cache;
 		if (n < MBFL_WCSPLANE_UTF32MAX && (n < 0xd800 || n > 0xdfff)) {
 			CK((*filter->output_function)(n, filter->data));
 		} else {