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

* commit '9707195bf18fed1318e5c747db82f9783262a137':
  Check integer overflow to prevent memory corruption