diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/generic/unwind-dw2-fde.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2017-04-17 Rabin Vincent <rabinv@axis.com> + + [BZ #21357] + * sysdeps/generic/unwind-dw2-fde.c (__deregister_frame_info_bases): + Call free() outside of mutex. + 2017-04-13 Florian Weimer <fweimer@redhat.com> * csu/check_fds.c (__libc_check_standard_fds): Assume O_NOFOLLOW diff --git a/sysdeps/generic/unwind-dw2-fde.c b/sysdeps/generic/unwind-dw2-fde.c index 2f0bcd2..104a255 100644 --- a/sysdeps/generic/unwind-dw2-fde.c +++ b/sysdeps/generic/unwind-dw2-fde.c @@ -202,6 +202,7 @@ __deregister_frame_info_bases (void *begin) { struct object **p; struct object *ob = 0; + struct fde_vector *tofree = NULL; /* If .eh_frame is empty, we haven't registered. */ if (*(uword *) begin == 0) @@ -225,7 +226,7 @@ __deregister_frame_info_bases (void *begin) { ob = *p; *p = ob->next; - free (ob->u.sort); + tofree = ob->u.sort; goto out; } } @@ -244,6 +245,7 @@ __deregister_frame_info_bases (void *begin) out: __gthread_mutex_unlock (&object_mutex); + free (tofree); return (void *) ob; } hidden_def (__deregister_frame_info_bases) |