Fix some issues caught via a static analyzer

I concentrated on the resource leaks rather than
any possible null dereferences.

Test: all pass
Change-Id: I2eab70648068058111b6dc82ba7494a1ff0ecb32
7 files changed