Fix shift UB in mbfilter_utf32.c

nikic · nikic · commit ae2bc6297ebc · 2019-06-19T15:09:00.000+02:00
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.c b/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 = (c & 0xff) << 24;
+			n = (unsigned) (c & 0xff) << 24;
 		}
 		filter->cache = n;
 		filter->status++;

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ int mbfl_filt_conv_utf32_wchar(int c, mbfl_convert_filter *filter)`
`138`	`138`	`if (endian) {`
`139`	`139`	`n = c & 0xff;`
`140`	`140`	`} else {`
`141`		`- n = (c & 0xff) << 24;`
	`141`	`+ n = (unsigned) (c & 0xff) << 24;`
`142`	`142`	`}`
`143`	`143`	`filter->cache = n;`
`144`	`144`	`filter->status++;`