diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2009-09-13 19:45:27 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2012-10-02 16:09:30 +0000 |
| commit | bb9510dc345f0b24de212604b2308dc6e6cc939a (patch) | |
| tree | 891d99c626b90c113210c7e88e28caca1c46fefa | |
| parent | 0569936773c861c791f10bba5e2f4cac5fbb4e78 (diff) | |
| download | glibc-bb9510dc345f0b24de212604b2308dc6e6cc939a.tar.gz glibc-bb9510dc345f0b24de212604b2308dc6e6cc939a.tar.xz glibc-bb9510dc345f0b24de212604b2308dc6e6cc939a.zip | |
Clarify memory allocation error diagnostics to avoid confusion
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | malloc/malloc.c | 3 |
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index d121446ac1..69d7941c64 100644 --- 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 3d62725666..ead7dea7a7 100644 --- 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 ca1d73f875..892bc64342 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) |