提交: 6fa0bc1c30c6f099771d91c574cccbce5535ae75 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• 修订版: 6fa0bc1c30c6f099771d91c574cccbce5535ae75 (tree)
• 时间: 2019-09-24 22:06:32
• 作者: Nick Alcock <nick.alcock@orac...>
• Commiter: Nick Alcock

Log Message

libctf: fix refcount leak in ctf_import

Calling ctf_import (fp, NULL) to cancel out a pre-existing import leaked
the refcnt increment on the parent, so it could never be freed.

New in v4.

libctf/
* ctf-open.c (ctf_import): Do not leak a ctf_file_t ref on every
ctf_import after the first for a given file.

更改概述

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

差异

--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,5 +1,10 @@
 2019-09-23  Nick Alcock  <[e-mail]>
 
+	* ctf-open.c (ctf_import): Do not leak a ctf_file_t ref on every
+	ctf_import after the first for a given file.
+
[phone]  Nick Alcock  <[e-mail]>
+
 	* ctf-impl.h (ctf_str_append_noerr): Declare.
 	* ctf-util.c (ctf_str_append_noerr): Define in terms of
 	ctf_str_append.

--- a/libctf/ctf-open.c
+++ b/libctf/ctf-open.c
@@ -1778,6 +1778,7 @@ ctf_import (ctf_file_t *fp, ctf_file_t *pfp)
 
   if (fp->ctf_parent != NULL)
     {
+      fp->ctf_parent->ctf_refcnt--;
       ctf_file_close (fp->ctf_parent);
       fp->ctf_parent = NULL;
     }
@@ -1793,6 +1794,7 @@ ctf_import (ctf_file_t *fp, ctf_file_t *pfp)
       fp->ctf_flags |= LCTF_CHILD;
       pfp->ctf_refcnt++;
     }
+
   fp->ctf_parent = pfp;
   return 0;
 }