Clarify memory allocation error diagnostics to avoid confusion

diff --git a/ChangeLog b/ChangeLog
index d121446..69d7941 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-02  Dmitry V. Levin  <ldv@altlinux.org>
+
+       [BZ #10631]
+       * malloc.c (malloc_printerr): Clarify error message.
+
 2012-10-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #14648]

diff --git a/NEWS b/NEWS
index 3d62725..ead7dea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,12 +10,12 @@ Version 2.17
 * The following bugs are resolved with this release:
 
   1349, 3479, 5044, 5298, 5400, 6530, 6778, 6808, 9685, 9914, 10014,
-  10038, 11438, 11607, 13412, 13542, 13629, 13679, 13696, 13717, 13741,
-  13939, 13966, 14042, 14090, 14150, 14151, 14154, 14157, 14166, 14173,
-  14195, 14237, 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336,
-  14337, 14347, 14349, 14376, 14459, 14476, 14477, 14505, 14510, 14516,
-  14518, 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14562, 14576,
-  14579, 14583, 14587, 14621, 14638, 14645, 14648.
+  10038, 10631, 11438, 11607, 13412, 13542, 13629, 13679, 13696, 13717,
+  13741, 13939, 13966, 14042, 14090, 14150, 14151, 14154, 14157, 14166,
+  14173, 14195, 14237, 14252, 14283, 14298, 14303, 14307, 14328, 14331,
+  14336, 14337, 14347, 14349, 14376, 14459, 14476, 14477, 14505, 14510,
+  14516, 14518, 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14562,
+  14576, 14579, 14583, 14587, 14621, 14638, 14645, 14648.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and

diff --git a/malloc/malloc.c b/malloc/malloc.c
index ca1d73f..892bc64 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4899,8 +4899,7 @@ malloc_printerr(int action, const char *str, void *ptr)
       while (cp > buf)
        *--cp = '0';
 
-      __libc_message (action & 2,
-                     "*** glibc detected *** %s: %s: 0x%s ***\n",
+      __libc_message (action & 2, "*** Error in `%s': %s: 0x%s ***\n",
                      __libc_argv[0] ?: "<unknown>", str, cp);
     }
   else if (action & 2)