utf8.c: avoid char overflow

bbolli · gitster · commit 2b647a05d722 · 2018-07-09T14:38:12.000-07:00
In ISO C, char constants must be in the range -128..127. Change the BOM
constants to char literals to avoid overflow.

Signed-off-by: Beat Bolli &lt;dev+git@drbeat.li&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/utf8.c b/utf8.c
@@ -566,10 +566,10 @@ static int has_bom_prefix(const char *data, size_t len,
 	return data && bom && (len >= bom_len) && !memcmp(data, bom, bom_len);
 }
 
-static const char utf16_be_bom[] = {0xFE, 0xFF};
-static const char utf16_le_bom[] = {0xFF, 0xFE};
-static const char utf32_be_bom[] = {0x00, 0x00, 0xFE, 0xFF};
-static const char utf32_le_bom[] = {0xFF, 0xFE, 0x00, 0x00};
+static const char utf16_be_bom[] = {'\xFE', '\xFF'};
+static const char utf16_le_bom[] = {'\xFF', '\xFE'};
+static const char utf32_be_bom[] = {'\0', '\0', '\xFE', '\xFF'};
+static const char utf32_le_bom[] = {'\xFF', '\xFE', '\0', '\0'};
 
 int has_prohibited_utf_bom(const char *enc, const char *data, size_t len)
 {

Original file line number	Diff line number	Diff line change
`@@ -566,10 +566,10 @@ static int has_bom_prefix(const char *data, size_t len,`
`566`	`566`	`return data && bom && (len >= bom_len) && !memcmp(data, bom, bom_len);`
`567`	`567`	`}`
`568`	`568`
`569`		`-static const char utf16_be_bom[] = {0xFE, 0xFF};`
`570`		`-static const char utf16_le_bom[] = {0xFF, 0xFE};`
`571`		`-static const char utf32_be_bom[] = {0x00, 0x00, 0xFE, 0xFF};`
`572`		`-static const char utf32_le_bom[] = {0xFF, 0xFE, 0x00, 0x00};`
	`569`	`+static const char utf16_be_bom[] = {'\xFE', '\xFF'};`
	`570`	`+static const char utf16_le_bom[] = {'\xFF', '\xFE'};`
	`571`	`+static const char utf32_be_bom[] = {'\0', '\0', '\xFE', '\xFF'};`
	`572`	`+static const char utf32_le_bom[] = {'\xFF', '\xFE', '\0', '\0'};`
`573`	`573`
`574`	`574`	`int has_prohibited_utf_bom(const char enc, const char data, size_t len)`
`575`	`575`	`{`