nptl: Decorate thread stack on pthread_create

[platform/upstream/glibc.git] / elf / dl-exception.c

diff --git a/elf/dl-exception.c b/elf/dl-exception.c
index f97d179..06a27cd 100644 (file)
--- a/elf/dl-exception.c
+++ b/elf/dl-exception.c
@@ -1,5 +1,5 @@
 /* ld.so error exception allocation and deallocation.
-   Copyright (C) 1995-2019 Free Software Foundation, Inc.
+   Copyright (C) 1995-2023 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <ldsodefs.h>
 #include <limits.h>
@@ -30,6 +30,17 @@
    a pointer comparison.  See below and in dlfcn/dlerror.c.  */
 static const char _dl_out_of_memory[] = "out of memory";
 
+/* Call free in the main libc.so.  This allows other namespaces to
+   free pointers on the main libc heap, via GLRO (dl_error_free).  It
+   also avoids calling free on the special, pre-allocated
+   out-of-memory error message.  */
+void
+_dl_error_free (void *ptr)
+{
+  if (ptr != _dl_out_of_memory)
+    free (ptr);
+}
+
 /* Dummy allocation object used if allocating the message buffer
    fails.  */
 static void
@@ -123,6 +134,7 @@ _dl_exception_create_format (struct dl_exception *exception, const char *objname
                  ++p;
                  break;
                }
+             /* Fall through.  */
            case 'x':
              length += INT_WIDTH / 4;
              break;
@@ -228,6 +240,7 @@ _dl_exception_create_format (struct dl_exception *exception, const char *objname
     if (len_objname != end - wptr)
       length_mismatch ();
     exception->objname = memcpy (wptr, objname, len_objname);
+    va_end (ap);
   }
 }
 rtld_hidden_def (_dl_exception_create_format)