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

Found by Clang trunk's Undefined-Behavior Sanitizer.  [more to come]
This commit is contained in:
Gregory P. Smith 2012-12-10 17:45:03 -08:00
commit c0dd80e439

View file

@ -427,7 +427,7 @@ SRE_CHARSET(SRE_CODE* set, SRE_CODE ch)
} }
else { else {
/* <CHARSET> <bitmap> (32 bits per code word) */ /* <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; return ok;
set += 8; set += 8;
} }
@ -466,7 +466,7 @@ SRE_CHARSET(SRE_CODE* set, SRE_CODE ch)
block = -1; block = -1;
set += 64; set += 64;
if (block >=0 && if (block >=0 &&
(set[block*8 + ((ch & 255)>>5)] & (1 << (ch & 31)))) (set[block*8 + ((ch & 255)>>5)] & (1u << (ch & 31))))
return ok; return ok;
set += count*8; set += count*8;
} }