fix memory leaks and uninitialized jump am: 0f520fac93
am: a83098b60e

* commit 'a83098b60edda2c5ea690fb6a7bb3cb76b46bc30':
  fix memory leaks and uninitialized jump