* stdlib/cxa_finalize.c (__cxa_finalize): When given a null argument,

	call all functions rather than none.
	Reported by Mark P. Mitchell <mark@codesourcery.com>.

diff --git a/ChangeLog b/ChangeLog
index edb051c37dcffd78e6a2391919bd645bd71273ea..aabb59a0bb82121ab40363a6a67f3a66d1f9f3b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-05  Roland McGrath  <roland@redhat.com>
+
+       * stdlib/cxa_finalize.c (__cxa_finalize): When given a null argument,
+       call all functions rather than none.
+       Reported by Mark P. Mitchell <mark@codesourcery.com>.
+
 2002-12-04  Roland McGrath  <roland@redhat.com>
 
        * locale/localeinfo.h [NL_CURRENT_INDIRECT]: Use attribute_tls_model_ie

diff --git a/stdlib/cxa_finalize.c b/stdlib/cxa_finalize.c
index e42f6bd71cc87ddc2c1ea81493a32b4227e4facc..16f50286e1f41d35e9281e404f15c992cd63b795 100644 (file)
--- a/stdlib/cxa_finalize.c
+++ b/stdlib/cxa_finalize.c
@@ -29,15 +29,12 @@ __cxa_finalize (void *d)
 {
   struct exit_function_list *funcs;
 
-  if (!d)
-    return;
-
   for (funcs = __exit_funcs; funcs; funcs = funcs->next)
     {
       struct exit_function *f;
 
       for (f = &funcs->fns[funcs->idx - 1]; f >= &funcs->fns[0]; --f)
-       if (d == f->func.cxa.dso_handle
+       if ((d == NULL || d == f->func.cxa.dso_handle)
            /* We don't want to run this cleanup more than once.  */
            && compare_and_swap (&f->flavor, ef_cxa, ef_free))
          (*f->func.cxa.fn) (f->func.cxa.arg, 0);