From e0f7a3804683f1ab3c41dfc82894bfb18d731341 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 17 Aug 2013 18:37:58 +0930 Subject: [PATCH] string/test-memcpy error reporting http://sourceware.org/ml/libc-alpha/2013-08/msg00094.html Using plain %s here runs the risk of segfaulting when displaying the string. src and dst aren't zero terminated strings. * string/test-memcpy.c (do_one_test): When reporting errors, print string address and don't overrun end of string. --- ChangeLog | 5 +++++ string/test-memcpy.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42607ea..a1c6f5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2013-10-04 Alan Modra + * string/test-memcpy.c (do_one_test): When reporting errors, print + string address and don't overrun end of string. + +2013-10-04 Alan Modra + * sysdeps/powerpc/powerpc64/power7/memchr.S: Replace rlwimi with insrdi. Make better use of reg selection to speed exit slightly. Schedule entry path a little better. Remove useless "are we done" diff --git a/string/test-memcpy.c b/string/test-memcpy.c index d121ef0..b7ebe5f 100644 --- a/string/test-memcpy.c +++ b/string/test-memcpy.c @@ -63,8 +63,8 @@ do_one_test (impl_t *impl, char *dst, const char *src, if (memcmp (dst, src, len) != 0) { - error (0, 0, "Wrong result in function %s dst \"%s\" src \"%s\"", - impl->name, dst, src); + error (0, 0, "Wrong result in function %s dst %p \"%.*s\" src %p \"%.*s\" len %zu", + impl->name, dst, (int) len, dst, src, (int) len, src, len); ret = 1; return; } -- 2.7.4