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

* commit 'a1e462e5531db20d1dc70c3e24c82879a0a90870':
  Check buffer size before using it