am 6724d864: Fix heap corruption and verification.

* commit '6724d8649ab73e4fb86c8014bda51b13bddf2f3f':
  Fix heap corruption and verification.