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 75e9f24c58d1cc552973824439cd8dea3dda54ff..fdd523734b7dbe0e0e58be1ba9ce78aad1e77e39 100644 (file)
--- 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 a3516cfbec2535204956cc3f17c1def67661b383..4334b58b99e29b2166f538cd0b368a5167d55451 100644 (file)
--- 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 a3ab8232b12d54edcfce69f9f7478fed7d7637c7..22e8e53a78af00b971b0e55b5dc43c5893cc2310 100644 (file)
--- 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 48ab64ee4796621f02da8b8add4336db49ad3b2e..fe7c5577b6d369e131e46929b51fc7d419086fb4 100644 (file)
--- 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 48ab64ee4796621f02da8b8add4336db49ad3b2e..fe7c5577b6d369e131e46929b51fc7d419086fb4 100644 (file)
--- 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 c1fd9a09c5157f6eb4e5952cfb81e57d546e2ac5..155c5bafb58ba3076b9c6fec1e7ae448aaa300e9 100644 (file)
--- 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 e733afe306b9637d6cf19850b05ffd02ea756c71..b31c53d7ba81d49ccafc736a7d32ef1fe6dc1e36 100644 (file)
--- 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 c04fabce89093cc07813e674b280edc156579058..b727b5fd1ead5e9e72ece7355ac9bc92097dbd9b 100644 (file)
--- 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 aee2580463a42adb8249b053c516e13f6faa66ec..14dd1d13f4299eda1813454d167e4cf36168a6e1 100644 (file)
--- 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 f440e835cf8364dcfc6d4e8e4f609035e7cef1ae..cf082691b123417373caf23a7f1a2570191b6c19 100644 (file)
--- 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 1ff871d1cc2d4696fb0184dd47127a6d5f238a29..32f63f7a4b50a066af118631b104bd014774754a 100644 (file)
--- 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 e2347325ebd196fd722ce6b5c5dfdcf568baba0b..685d9c63839baca0673d6a967ef56ba9e7828fe9 100644 (file)
--- 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)