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

* commit '0afecdebaea1982ead120a701ddd24f2b0ff3897':
  Check buffer size before using it