Merge branch 'jk/diff-files-cleanup-fix' into maint

An earlier attempt to plug leaks placed a clean-up label to jump to at a bogus place, which as been corrected. source: <Ys0c0ePxPOqZ/5ck@coredump.intra.peff.net> * jk/diff-files-cleanup-fix: diff-files: move misplaced cleanup label