am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '3cc11bfc00cbb3ed87a4464777a75606b4973b51':
  Fix several ineffective integer overflow checks