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

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