Suppress an integer-overflow warning.

tglsfdc · tglsfdc · commit 4dbbef284555 · 2007-07-12T21:17:09.000Z
diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c
@@ -1,7 +1,7 @@
 /*
  * conversion functions between pg_wchar and multibyte streams.
  * Tatsuo Ishii
- * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.62 2007/04/15 10:56:25 ishii Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.63 2007/07/12 21:17:09 tgl Exp $
  *
  * WIN1250 client encoding updated by Pavel Behal
  *
@@ -280,7 +280,7 @@ static int	pg_euctw2wchar_with_len
 		if (*from == SS2 && len >= 4)	/* code set 2 */
 		{
 			from++;
-			*to = (SS2 << 24) | (*from++ << 16);
+			*to = (((uint32) SS2) << 24) | (*from++ << 16);
 			*to |= *from++ << 8;
 			*to |= *from++;
 			len -= 4;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* conversion functions between pg_wchar and multibyte streams.`
`3`	`3`	`* Tatsuo Ishii`
`4`		`- * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.62 2007/04/15 10:56:25 ishii Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.63 2007/07/12 21:17:09 tgl Exp $`
`5`	`5`	`*`
`6`	`6`	`* WIN1250 client encoding updated by Pavel Behal`
`7`	`7`	`*`
`@@ -280,7 +280,7 @@ static int pg_euctw2wchar_with_len`
`280`	`280`	`if (from == SS2 && len >= 4) / code set 2 */`
`281`	`281`	`{`
`282`	`282`	`from++;`
`283`		`- to = (SS2 << 24) \| (from++ << 16);`
	`283`	`+ to = (((uint32) SS2) << 24) \| (from++ << 16);`
`284`	`284`	`to \|= from++ << 8;`
`285`	`285`	`to \|= from++;`
`286`	`286`	`len -= 4;`