am e2fbb2ac: am d3dd83c6: am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory leak"

* commit 'e2fbb2ac6802e54d67a910da790711fbb2f09201':
  fix possible buffer overrun and memory leak