am 372648a7: Merge "Fix access to freed memory"

* commit '372648a70bbb2778edcdad588c8d133a6c55a033':
  Fix access to freed memory