[PATCH v2] [BZ #10631] Clarify memory allocation error diagnostics to avoid confusion

[Dmitry V. Levin]

---
[BZ #10631]
* malloc.c (malloc_printerr): Clarify error message.

 ChangeLog       |    5 +++++
 NEWS            |    4 ++--
 malloc/malloc.c |    3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 13523ac..a627922 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,8 @@ Version 2.17
 
 * The following bugs are resolved with this release:
 
-  1349, 3479, 5044, 5400, 6778, 6808, 9685, 9914, 10014, 10038, 11607,
-  13412, 13542, 13717, 13696, 13939, 13966, 14042, 14090, 14166, 14150,
+  1349, 3479, 5044, 5400, 6778, 6808, 9685, 9914, 10014, 10038, 10631,
+  11607, 13412, 13542, 13696, 13717, 13939, 13966, 14042, 14090, 14150,
   14151, 14154, 14157, 14166, 14173, 14195, 14237, 14252, 14283, 14298,
   14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14459, 14476,
   14505, 14510, 14516, 14518, 14519, 14532, 14538, 14544, 14545, 14562,
diff --git a/malloc/malloc.c b/malloc/malloc.c
index ca1d73f..892bc64 100644
--- 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)

-- 
ldv