From: Nicholas Nethercote Date: Tue, 13 Apr 2004 08:36:35 +0000 (+0000) Subject: Changed error message from: X-Git-Tag: svn/VALGRIND_2_1_2~149 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a0aeb3716c8207b456b23a2fc7300bb65564367;p=thirdparty%2Fvalgrind.git Changed error message from: Address 0x%x is not stack'd, malloc'd or free'd to Address 0x%x is not stack'd, malloc'd or (recently) free'd This makes things clearer in some circumstances, particularly when bogusly accessing heap memory that has been freed, but Memcheck is no longer tracking. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2358 --- diff --git a/addrcheck/tests/fprw.stderr.exp b/addrcheck/tests/fprw.stderr.exp index 75e9f24c58..fdd523734b 100644 --- a/addrcheck/tests/fprw.stderr.exp +++ b/addrcheck/tests/fprw.stderr.exp @@ -25,7 +25,7 @@ Invalid write of size 4 Invalid free() / delete / delete[] at 0x........: free (vg_replace_malloc.c:...) by 0x........: main (fprw.c:22) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Invalid write of size 8 at 0x........: main (fprw.c:24) diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c index a3516cfbec..4334b58b99 100644 --- a/helgrind/hg_main.c +++ b/helgrind/hg_main.c @@ -2585,7 +2585,7 @@ static void pp_AddrInfo ( Addr a, AddrInfo* ai ) " v 2.96 or 3.0.X. To suppress, use: --workaround-gcc296-bugs=yes"); } else { VG_(message)(Vg_UserMsg, - " Address %p is not stack'd, malloc'd or free'd", a); + " Address %p is not stack'd, malloc'd or (recently) free'd", a); } break; case Segment: diff --git a/memcheck/mac_needs.c b/memcheck/mac_needs.c index a3ab8232b1..22e8e53a78 100644 --- a/memcheck/mac_needs.c +++ b/memcheck/mac_needs.c @@ -238,7 +238,7 @@ void MAC_(pp_AddrInfo) ( Addr a, AddrInfo* ai ) " v 2.96 or 3.0.X. To suppress, use: --workaround-gcc296-bugs=yes"); } else { VG_(message)(Vg_UserMsg, - " Address 0x%x is not stack'd, malloc'd or free'd", a); + " Address 0x%x is not stack'd, malloc'd or (recently) free'd",a); } break; case Freed: case Mallocd: case UserG: { diff --git a/memcheck/tests/badfree-2trace.stderr.exp b/memcheck/tests/badfree-2trace.stderr.exp index 48ab64ee47..fe7c5577b6 100644 --- a/memcheck/tests/badfree-2trace.stderr.exp +++ b/memcheck/tests/badfree-2trace.stderr.exp @@ -1,7 +1,7 @@ Invalid free() / delete / delete[] at 0x........: free (vg_replace_malloc.c:...) by 0x........: main (badfree.c:12) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Invalid free() / delete / delete[] at 0x........: free (vg_replace_malloc.c:...) diff --git a/memcheck/tests/badfree.stderr.exp b/memcheck/tests/badfree.stderr.exp index 48ab64ee47..fe7c5577b6 100644 --- a/memcheck/tests/badfree.stderr.exp +++ b/memcheck/tests/badfree.stderr.exp @@ -1,7 +1,7 @@ Invalid free() / delete / delete[] at 0x........: free (vg_replace_malloc.c:...) by 0x........: main (badfree.c:12) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Invalid free() / delete / delete[] at 0x........: free (vg_replace_malloc.c:...) diff --git a/memcheck/tests/badjump.stderr.exp b/memcheck/tests/badjump.stderr.exp index c1fd9a09c5..155c5bafb5 100644 --- a/memcheck/tests/badjump.stderr.exp +++ b/memcheck/tests/badjump.stderr.exp @@ -3,7 +3,7 @@ Jump to the invalid address stated on the next line at 0x........: ??? by 0x........: __libc_start_main (...libc...) by 0x........: ... - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Process terminating with default action of signal 11 (SIGSEGV) Access not within mapped region at address 0x........ diff --git a/memcheck/tests/buflen_check.stderr.exp b/memcheck/tests/buflen_check.stderr.exp index e733afe306..b31c53d7ba 100644 --- a/memcheck/tests/buflen_check.stderr.exp +++ b/memcheck/tests/buflen_check.stderr.exp @@ -2,7 +2,7 @@ Syscall param socketcall.getsockname(name) contains unaddressable byte(s) at 0x........: getsockname (in /...libc...) by 0x........: __libc_start_main (...libc...) by 0x........: ... - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Syscall param socketcall.getsockname(namelen_in) contains uninitialised or unaddressable byte(s) at 0x........: getsockname (in /...libc...) diff --git a/memcheck/tests/custom_alloc.stderr.exp b/memcheck/tests/custom_alloc.stderr.exp index c04fabce89..b727b5fd1e 100644 --- a/memcheck/tests/custom_alloc.stderr.exp +++ b/memcheck/tests/custom_alloc.stderr.exp @@ -8,7 +8,7 @@ Invalid write of size 4 Invalid free() / delete / delete[] at 0x........: custom_free (custom_alloc.c:54) by 0x........: main (custom_alloc.c:83) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Mismatched free() / delete / delete [] at 0x........: custom_free (custom_alloc.c:54) diff --git a/memcheck/tests/execve.stderr.exp b/memcheck/tests/execve.stderr.exp index aee2580463..14dd1d13f4 100644 --- a/memcheck/tests/execve.stderr.exp +++ b/memcheck/tests/execve.stderr.exp @@ -1,14 +1,14 @@ Syscall param execve(filename) contains uninitialised or unaddressable byte(s) at 0x........: execve (in /...libc...) by 0x........: main (execve.c:8) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Syscall param execve(argv[i]) contains uninitialised or unaddressable byte(s) at 0x........: execve (in /...libc...) by 0x........: main (execve.c:8) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Syscall param execve(envp[i]) contains uninitialised or unaddressable byte(s) at 0x........: execve (in /...libc...) by 0x........: main (execve.c:8) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd diff --git a/memcheck/tests/fprw.stderr.exp b/memcheck/tests/fprw.stderr.exp index f440e835cf..cf082691b1 100644 --- a/memcheck/tests/fprw.stderr.exp +++ b/memcheck/tests/fprw.stderr.exp @@ -37,7 +37,7 @@ Invalid write of size 4 Invalid free() / delete / delete[] at 0x........: free (vg_replace_malloc.c:...) by 0x........: main (fprw.c:22) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Invalid write of size 8 at 0x........: main (fprw.c:24) diff --git a/memcheck/tests/signal2.stderr.exp b/memcheck/tests/signal2.stderr.exp index 1ff871d1cc..32f63f7a4b 100644 --- a/memcheck/tests/signal2.stderr.exp +++ b/memcheck/tests/signal2.stderr.exp @@ -1,3 +1,3 @@ Invalid write of size 4 at 0x........: main (signal2.c:17) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd diff --git a/memcheck/tests/writev.stderr.exp b/memcheck/tests/writev.stderr.exp index e2347325eb..685d9c6383 100644 --- a/memcheck/tests/writev.stderr.exp +++ b/memcheck/tests/writev.stderr.exp @@ -3,19 +3,19 @@ Test file created. Syscall param writev(vector[...]) contains uninitialised or unaddressable byte(s) at 0x........: writev (in /...libc...) by 0x........: main (writev.c:56) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Received EFAULT as expected Syscall param writev(vector) contains uninitialised or unaddressable byte(s) at 0x........: writev (in /...libc...) by 0x........: main (writev.c:68) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Received EINVAL as expected Syscall param readv(vector) contains uninitialised or unaddressable byte(s) at 0x........: readv (in /...libc...) by 0x........: main (writev.c:76) - Address 0x........ is not stack'd, malloc'd or free'd + Address 0x........ is not stack'd, malloc'd or (recently) free'd Received EINVAL as expected ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)