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

* commit '484ebc81263a627b5e24e65373ab0752996ca0c8':
  Check buffer size before using it