am 7f9a0962: am 98ba6f11: am d3d32a1b: Merge "Fix file descriptor leak when opening invalid archives."

* commit '7f9a0962ef54fd1549fe34a6683e8fdff96d8c75':
  Fix file descriptor leak when opening invalid archives.