Merge pull request #26 from Shopify/fix_32_bit_uints

Fix problems with overflowing 32 bit uints

Author: xthexder

bit32.go

@@ -7,7 +7,7 @@ import (
 const bitCount = 32
 
 func trim(x uint) uint { return x & math.MaxUint32 }
-func mask(n uint) uint { return ^((math.MaxUint32 << 1) << (n - 1)) }
+func mask(n uint) uint { return ^(math.MaxUint32 << n) }
 
 func shift(l *State, r uint, i int) int {
 	if i < 0 {

undump.go

@@ -65,7 +65,7 @@ func (state *loadState) readString() (s string, err error) {
 	var size uintptr
 	var size64 uint64
 	var size32 uint32
-	if maxUint == math.MaxUint64 {
+	if uint64(maxUint) == math.MaxUint64 {
 		err = state.read(&size64)
 		size = uintptr(size64)
 	} else if maxUint == math.MaxUint32 {