Upstream

fix:  potential overflow in intset.c

clean: mismatch comment and redundant code