1 << 31 is invalid for signed integers, fix it by making 1 unsigned.

gpshead · gpshead · commit c0dd80e439bf · 2012-12-10T17:45:03.000-08:00
Found by Clang trunk's Undefined-Behavior Sanitizer.  [more to come]
diff --git a/Modules/_sre.c b/Modules/_sre.c
@@ -427,7 +427,7 @@ SRE_CHARSET(SRE_CODE* set, SRE_CODE ch)
             }
             else {
                 /* <CHARSET> <bitmap> (32 bits per code word) */
-                if (ch < 256 && (set[ch >> 5] & (1 << (ch & 31))))
+                if (ch < 256 && (set[ch >> 5] & (1u << (ch & 31))))
                     return ok;
                 set += 8;
             }
@@ -466,7 +466,7 @@ SRE_CHARSET(SRE_CODE* set, SRE_CODE ch)
                     block = -1;
                 set += 64;
                 if (block >=0 &&
-                    (set[block*8 + ((ch & 255)>>5)] & (1 << (ch & 31))))
+                    (set[block*8 + ((ch & 255)>>5)] & (1u << (ch & 31))))
                     return ok;
                 set += count*8;
             }

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ SRE_CHARSET(SRE_CODE* set, SRE_CODE ch)`
`427`	`427`	`}`
`428`	`428`	`else {`
`429`	`429`	`/* <CHARSET> <bitmap> (32 bits per code word) */`
`430`		`- if (ch < 256 && (set[ch >> 5] & (1 << (ch & 31))))`
	`430`	`+ if (ch < 256 && (set[ch >> 5] & (1u << (ch & 31))))`
`431`	`431`	`return ok;`
`432`	`432`	`set += 8;`
`433`	`433`	`}`
`@@ -466,7 +466,7 @@ SRE_CHARSET(SRE_CODE* set, SRE_CODE ch)`
`466`	`466`	`block = -1;`
`467`	`467`	`set += 64;`
`468`	`468`	`if (block >=0 &&`
`469`		`- (set[block*8 + ((ch & 255)>>5)] & (1 << (ch & 31))))`
	`469`	`+ (set[block*8 + ((ch & 255)>>5)] & (1u << (ch & 31))))`
`470`	`470`	`return ok;`
`471`	`471`	`set += count*8;`
`472`	`472`	`}`