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

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