This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] [BZ #10631] Clarify malloc error diagnostics to avoid confusion
- From: "Dmitry V. Levin" <ldv at altlinux dot org>
- To: libc-alpha at sourceware dot org
- Date: Tue, 18 Sep 2012 03:10:13 +0400
- Subject: [PATCH] [BZ #10631] Clarify malloc error diagnostics to avoid confusion
---
ChangeLog | 5 +++++
NEWS | 6 +++---
malloc/malloc.c | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bb46639..cb51d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-17 Dmitry V. Levin <ldv@altlinux.org>
+
+ [BZ #10631]
+ * malloc.c (malloc_printerr): Clarify error message.
+
2012-09-17 Chris Metcalf <cmetcalf@tilera.com>
* crypt/md5test-giant.c (TIMEOUT): Increase to 8 minutes for tilegx.
diff --git a/NEWS b/NEWS
index adcb741..4bcc116 100644
--- a/NEWS
+++ b/NEWS
@@ -9,12 +9,12 @@ Version 2.17
* The following bugs are resolved with this release:
- 1349, 3479, 5400, 6778, 6808, 9685, 9914, 10014, 10038, 11607, 13412,
- 13542, 13717, 13696, 13939, 13966, 14042, 14090, 14166, 14150, 14151,
+ 1349, 3479, 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, 14576, 14583,
- 14587
+ 14587.
* 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..5eecb02 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4900,7 +4900,7 @@ malloc_printerr(int action, const char *str, void *ptr)
*--cp = '0';
__libc_message (action & 2,
- "*** glibc detected *** %s: %s: 0x%s ***\n",
+ "*** glibc has detected an error in %s: %s: 0x%s ***\n",
__libc_argv[0] ?: "<unknown>", str, cp);
}
else if (action & 2)
--
ldv