am e276aef8: am 0cf16339: Merge "Fix preventing from heap overwrite in capture command"

* commit 'e276aef8779a7763b318ebd3e8c09f35ff37a95c':
  Fix preventing from heap overwrite in capture command