Clean up resource allocation and freeing.
Signed-off-by: NIan Molton <ian.molton@codethink.co.uk>
Signed-off-by: NBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: NUlf Hansson <ulf.hansson@linaro.org>