dcavalca / rpms / rpm

Forked from rpms/rpm a year ago
Clone
James Antill ee2eaf
From 38c03ddb18e86c84d89af695f72442d8365eb64e Mon Sep 17 00:00:00 2001
James Antill ee2eaf
From: Florian Festi <ffesti@redhat.com>
James Antill ee2eaf
Date: Tue, 21 Jul 2020 10:45:20 +0200
James Antill ee2eaf
Subject: [PATCH] Always close libelf handle (#1313)
James Antill ee2eaf
James Antill ee2eaf
Otherwise executables that are not proper elf files are leaking libelf
James Antill ee2eaf
handles. This results in file being left open (mmap'ed) and fails the
James Antill ee2eaf
build on NFS as those files can't be deleted properly there.
James Antill ee2eaf
James Antill ee2eaf
Resolves: rhbz#1840728
James Antill ee2eaf
See also: https://bugzilla.redhat.com/show_bug.cgi?id=1840728
James Antill ee2eaf
---
James Antill ee2eaf
 build/files.c | 2 +-
James Antill ee2eaf
 1 file changed, 1 insertion(+), 1 deletion(-)
James Antill ee2eaf
James Antill ee2eaf
diff --git a/build/files.c b/build/files.c
James Antill ee2eaf
index f675306f7..62489c07c 100644
James Antill ee2eaf
--- a/build/files.c
James Antill ee2eaf
+++ b/build/files.c
James Antill ee2eaf
@@ -1935,8 +1935,8 @@ static int generateBuildIDs(FileList fl, ARGV_t *files)
James Antill ee2eaf
 			if (terminate)
James Antill ee2eaf
 			    rc = 1;
James Antill ee2eaf
 		    }
James Antill ee2eaf
-		    elf_end (elf);
James Antill ee2eaf
 		}
James Antill ee2eaf
+		elf_end (elf);
James Antill ee2eaf
 		close (fd);
James Antill ee2eaf
 	    }
James Antill ee2eaf
 	}
James Antill ee2eaf
-- 
James Antill ee2eaf
2.26.2
James Antill ee2eaf