Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1

diff --git a/gpg-interface.c b/gpg-interface.c
index 0863c618007a02fa20c27b62614de8a554128d0c..5f142f619855ccd664a84be366bf6877a48e6da4 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -130,8 +130,10 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
        write_in_full(gpg.in, payload, payload_size);
        close(gpg.in);
 
-       if (gpg_output)
+       if (gpg_output) {
                strbuf_read(gpg_output, gpg.err, 0);
+               close(gpg.err);
+       }
        ret = finish_command(&gpg);
 
        unlink_or_warn(path);