提交: bf05b84eda6ea5e903ed19fad4e509eca43a7267 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• 修訂: bf05b84eda6ea5e903ed19fad4e509eca43a7267 (tree)
• 時間: 2019-09-23 22:12:54
• 作者: Nick Alcock <nick.alcock@orac...>
• Commiter: Nick Alcock

Log Message

libctf: actually close bfds we have opened

When we do a ctf_fdopen, we open things via bfd_fdopenr and set up a
hook to close the bfd again... but then we never actually call that hook
from anywhere, so we eventually leak every bfd we open.

Fix this by calling the hook (if set) in ctf_arc_close.

New in v3.

libctf/
* ctf-archive.c (ctf_arc_close): Call ctfi_bfd_close if set.
* ctf-open-bfd.c (ctf_bfdclose): Fix comment.

Change Summary

• modified: libctf/ChangeLog
• modified: libctf/ctf-archive.c
• modified: libctf/ctf-open-bfd.c

差異

--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,5 +1,10 @@
 2019-07-30  Nick Alcock  <[e-mail]>
 
+	* ctf-archive.c (ctf_arc_close): Call ctfi_bfd_close if set.
+	* ctf-open-bfd.c (ctf_bfdclose): Fix comment.
+
[phone]  Nick Alcock  <[e-mail]>
+
 	* ctf-open-bfd.c (ctf_fdopen): Call bfd_set_cacheable.
 
 2019-07-13  Nick Alcock  <[e-mail]>

--- a/libctf/ctf-archive.c
+++ b/libctf/ctf-archive.c
@@ -436,6 +436,8 @@ ctf_arc_close (ctf_archive_t *arc)
   free ((void *) arc->ctfi_symsect.cts_data);
   /* Do not free the ctfi_strsect: it is bound to the bfd.  */
   free (arc->ctfi_data);
+  if (arc->ctfi_bfd_close)
+    arc->ctfi_bfd_close (arc);
   free (arc);
 }
 

--- a/libctf/ctf-open-bfd.c
+++ b/libctf/ctf-open-bfd.c
@@ -66,7 +66,7 @@ ctf_new_archive_internal (int is_archive, struct ctf_archive *arc,
   return arci;
 }
 
-/* Free the BFD bits of a CTF file on ctf_file_close().  */
+/* Free the BFD bits of a CTF file on ctf_arc_close().  */
 
 static void
 ctf_bfdclose (struct ctf_archive_internal *arci)