Fix a few leaks found while valgrinding unit tests

See the commit messages for details.

Some of these could potentially need backporting. I’ll look into that once this is merged.

Signed-off-by: Philip Withnall pwithnall@endlessos.org