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

* commit '5b9437df99b0351d7e94a61c9f599d9031f24c08':
  fix possible buffer overrun and memory leak