Merge change 11019

* changes:
  Fix invalid free() of stack-allocated array.