am 6f0b1b3e: am 484ebc81: am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-dev

* commit '6f0b1b3e25eb2db2e8465f13268c297fa9070012':
  Check buffer size before using it