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

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