am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev

* commit '8a1a5d17ddc3ff902a9d9e1858713ed9406c45c8':
  Check integer overflow to prevent memory corruption