Merge "uncrypt: avoid use-after-free" am: 0305fcecc5
am: 4edfeb84dd

* commit '4edfeb84ddd8fe93d3dcb028fc1f0a7c12f21271':
  uncrypt: avoid use-after-free