Changed error messages: subsidiary explanations within an error message are now
indented one space; previously it was mixed, but Memcheck/Addrcheck indented
"Address" lines 3, which made them hard to see in the stack trace.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2021 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/addrcheck/tests/badrw.stderr.exp b/addrcheck/tests/badrw.stderr.exp
index 4ac32de..a6f168c 100644
--- a/addrcheck/tests/badrw.stderr.exp
+++ b/addrcheck/tests/badrw.stderr.exp
@@ -1,35 +1,35 @@
Invalid read of size 4
at 0x........: main (badrw.c:12)
- Address 0x........ is 4 bytes before a block of size 10 alloc'd
+ Address 0x........ is 4 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid write of size 4
at 0x........: main (badrw.c:12)
- Address 0x........ is 4 bytes before a block of size 10 alloc'd
+ Address 0x........ is 4 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid read of size 2
at 0x........: main (badrw.c:13)
- Address 0x........ is 4 bytes before a block of size 10 alloc'd
+ Address 0x........ is 4 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid write of size 2
at 0x........: main (badrw.c:13)
- Address 0x........ is 4 bytes before a block of size 10 alloc'd
+ Address 0x........ is 4 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid read of size 1
at 0x........: main (badrw.c:14)
- Address 0x........ is 1 bytes before a block of size 10 alloc'd
+ Address 0x........ is 1 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid write of size 1
at 0x........: main (badrw.c:14)
- Address 0x........ is 1 bytes before a block of size 10 alloc'd
+ Address 0x........ is 1 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
diff --git a/addrcheck/tests/fprw.stderr.exp b/addrcheck/tests/fprw.stderr.exp
index 43d29c7..75e9f24 100644
--- a/addrcheck/tests/fprw.stderr.exp
+++ b/addrcheck/tests/fprw.stderr.exp
@@ -1,34 +1,34 @@
Invalid read of size 8
at 0x........: main (fprw.c:20)
- Address 0x........ is 0 bytes inside a block of size 8 free'd
+ Address 0x........ is 0 bytes inside a block of size 8 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:18)
Invalid write of size 8
at 0x........: main (fprw.c:20)
- Address 0x........ is 0 bytes inside a block of size 8 free'd
+ Address 0x........ is 0 bytes inside a block of size 8 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:18)
Invalid read of size 4
at 0x........: main (fprw.c:21)
- Address 0x........ is 0 bytes inside a block of size 4 free'd
+ Address 0x........ is 0 bytes inside a block of size 4 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:19)
Invalid write of size 4
at 0x........: main (fprw.c:21)
- Address 0x........ is 0 bytes inside a block of size 4 free'd
+ Address 0x........ is 0 bytes inside a block of size 4 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:19)
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 free'd
Invalid write of size 8
at 0x........: main (fprw.c:24)
- Address 0x........ is 0 bytes inside a block of size 4 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:23)
diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index 76900d8..04b14e4 100644
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -1322,28 +1322,28 @@
switch(sigNo) {
case VKI_SIGSEGV:
switch(info->si_code) {
- case 1: event = "address not mapped to object"; break;
- case 2: event = "invalid permissions for mapped object"; break;
+ case 1: event = "Address not mapped to object"; break;
+ case 2: event = "Invalid permissions for mapped object"; break;
}
break;
case VKI_SIGILL:
switch(info->si_code) {
- case 1: event = "illegal opcode"; break;
- case 2: event = "illegal operand"; break;
- case 3: event = "illegal addressing mode"; break;
- case 4: event = "illegal trap"; break;
- case 5: event = "privileged opcode"; break;
- case 6: event = "privileged register"; break;
- case 7: event = "coprocessor error"; break;
- case 8: event = "internal stack error"; break;
+ case 1: event = "Illegal opcode"; break;
+ case 2: event = "Illegal operand"; break;
+ case 3: event = "Illegal addressing mode"; break;
+ case 4: event = "Illegal trap"; break;
+ case 5: event = "Privileged opcode"; break;
+ case 6: event = "Privileged register"; break;
+ case 7: event = "Coprocessor error"; break;
+ case 8: event = "Internal stack error"; break;
}
break;
case VKI_SIGFPE:
switch (info->si_code) {
- case 1: event = "integer divide by zero"; break;
- case 2: event = "integer overflow"; break;
+ case 1: event = "Integer divide by zero"; break;
+ case 2: event = "Integer overflow"; break;
case 3: event = "FP divide by zero"; break;
case 4: event = "FP overflow"; break;
case 5: event = "FP underflow"; break;
@@ -1355,15 +1355,15 @@
case VKI_SIGBUS:
switch (info->si_code) {
- case 1: event = "invalid address alignment"; break;
- case 2: event = "non-existent physical address"; break;
- case 3: event = "hardware error"; break;
+ case 1: event = "Invalid address alignment"; break;
+ case 2: event = "Non-existent physical address"; break;
+ case 3: event = "Hardware error"; break;
}
break;
}
if (event != NULL)
- VG_(message)(Vg_UserMsg, " %s at address %p",
+ VG_(message)(Vg_UserMsg, " %s at address %p",
event, info->_sifields._sigfault._addr);
}
diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index e8a3c24..2a2a1c1 100644
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -2528,32 +2528,34 @@
{
if (ai->expr != NULL)
VG_(message)(Vg_UserMsg,
- " Address %p == %s", a, ai->expr);
+ " Address %p == %s", a, ai->expr);
switch (ai->akind) {
case Stack:
VG_(message)(Vg_UserMsg,
- " Address %p is on thread %d's stack",
+ " Address %p is on thread %d's stack",
a, ai->stack_tid);
break;
case Unknown:
if (ai->expr != NULL)
break;
+ /* maybe_gcc is never set to True! This is a hangover from code
+ in Memcheck */
if (ai->maybe_gcc) {
VG_(message)(Vg_UserMsg,
- " Address %p is just below %%esp. Possibly a bug in GCC/G++",
+ " Address %p is just below %%esp. Possibly a bug in GCC/G++",
a);
VG_(message)(Vg_UserMsg,
" 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 free'd", a);
}
break;
case Segment:
VG_(message)(Vg_UserMsg,
- " Address %p is in %s section of %s",
+ " Address %p is in %s section of %s",
a, ai->section, ai->filename);
break;
case Mallocd:
@@ -2571,7 +2573,7 @@
relative = "inside";
}
VG_(message)(Vg_UserMsg,
- " Address %p is %d bytes %s a block of size %d %s by thread %d",
+ " Address %p is %d bytes %s a block of size %d %s by thread %d",
a, delta, relative,
ai->blksize,
ai->akind == Mallocd ? "alloc'd" : "freed",
@@ -2660,7 +2662,7 @@
}
if (*msg)
- VG_(message)(Vg_UserMsg, " Previous state: %s", msg);
+ VG_(message)(Vg_UserMsg, " Previous state: %s", msg);
if (clo_execontext == EC_Some
&& extra->lasttouched.uu_ec_eip.eip != 0) {
@@ -2668,7 +2670,7 @@
UInt line;
Addr eip = extra->lasttouched.uu_ec_eip.eip;
- VG_(message)(Vg_UserMsg, " Word at %p last changed state from %s by thread %u",
+ VG_(message)(Vg_UserMsg, " Word at %p last changed state from %s by thread %u",
err_addr,
pp_state(extra->lasttouched.state),
unpackTLS(extra->lasttouched.tls)->tid);
@@ -2684,7 +2686,7 @@
}
} else if (clo_execontext == EC_All
&& extra->lasttouched.uu_ec_eip.ec != NULL) {
- VG_(message)(Vg_UserMsg, " Word at %p last changed state from %s in tid %u",
+ VG_(message)(Vg_UserMsg, " Word at %p last changed state from %s in tid %u",
err_addr,
pp_state(extra->lasttouched.state),
unpackTLS(extra->lasttouched.tls)->tid);
@@ -2700,7 +2702,7 @@
VG_(get_error_string)(err));
VG_(pp_ExeContext)( VG_(get_error_where)(err) );
if (extra->lasttouched.uu_ec_eip.ec != NULL) {
- VG_(message)(Vg_UserMsg, " last touched by thread %d", extra->lasttid);
+ VG_(message)(Vg_UserMsg, " last touched by thread %d", extra->lasttid);
VG_(pp_ExeContext)(extra->lasttouched.uu_ec_eip.ec);
}
pp_AddrInfo(VG_(get_error_address)(err), &extra->addrinfo);
@@ -2725,12 +2727,12 @@
if (0 && !ismember(lsmx->lockdep, extra->mutex))
continue;
- VG_(message)(Vg_UserMsg, " %p%(y last locked at",
+ VG_(message)(Vg_UserMsg, " %p%(y last locked at",
lsmx->mutexp, lsmx->mutexp);
VG_(pp_ExeContext)(lsmx->location);
VG_(free)(msg);
msg = lockset_str(NULL, lsmx->lockdep);
- VG_(message)(Vg_UserMsg, " while depending on locks %s", msg);
+ VG_(message)(Vg_UserMsg, " while depending on locks %s", msg);
}
break;
diff --git a/helgrind/tests/deadlock.stderr.exp b/helgrind/tests/deadlock.stderr.exp
index d02e768..a60d087 100644
--- a/helgrind/tests/deadlock.stderr.exp
+++ b/helgrind/tests/deadlock.stderr.exp
@@ -6,10 +6,10 @@
by 0x........: thread_wrapper (vg_libpthread.c:...)
by 0x........: do__quit (vg_scheduler.c:...)
while holding locks 0x........(m2)
- 0x........(m2) last locked at
+ 0x........(m2) last locked at
at 0x........: __pthread_mutex_lock (vg_libpthread.c:...)
by 0x........: t2 (deadlock.c:19)
by 0x........: thread_wrapper (vg_libpthread.c:...)
by 0x........: do__quit (vg_scheduler.c:...)
- while depending on locks 0x........(m1)
+ while depending on locks 0x........(m1)
diff --git a/helgrind/tests/race.stderr.exp b/helgrind/tests/race.stderr.exp
index a75ed34..96832e6 100644
--- a/helgrind/tests/race.stderr.exp
+++ b/helgrind/tests/race.stderr.exp
@@ -4,6 +4,6 @@
at 0x........: th (race.c:10)
by 0x........: thread_wrapper (vg_libpthread.c:...)
by 0x........: do__quit (vg_scheduler.c:...)
- Address 0x........ is in BSS section of /...helgrind/tests...
- Previous state: shared RO, no locks
+ Address 0x........ is in BSS section of /...helgrind/tests...
+ Previous state: shared RO, no locks
diff --git a/helgrind/tests/race2.stderr.exp b/helgrind/tests/race2.stderr.exp
index 3cdcd98..9a7d7e6 100644
--- a/helgrind/tests/race2.stderr.exp
+++ b/helgrind/tests/race2.stderr.exp
@@ -4,6 +4,6 @@
at 0x........: th (race2.c:17)
by 0x........: thread_wrapper (vg_libpthread.c:...)
by 0x........: do__quit (vg_scheduler.c:...)
- Address 0x........ == &(f->poot[5].plop[11]) at race2.c:17
- Previous state: shared RO, no locks
+ Address 0x........ == &(f->poot[5].plop[11]) at race2.c:17
+ Previous state: shared RO, no locks
diff --git a/memcheck/mac_needs.c b/memcheck/mac_needs.c
index ef5fff4..1fd0ef7 100644
--- a/memcheck/mac_needs.c
+++ b/memcheck/mac_needs.c
@@ -226,19 +226,19 @@
switch (ai->akind) {
case Stack:
VG_(message)(Vg_UserMsg,
- " Address 0x%x is on thread %d's stack",
+ " Address 0x%x is on thread %d's stack",
a, ai->stack_tid);
break;
case Unknown:
if (ai->maybe_gcc) {
VG_(message)(Vg_UserMsg,
- " Address 0x%x is just below %%esp. Possibly a bug in GCC/G++",
+ " Address 0x%x is just below %%esp. Possibly a bug in GCC/G++",
a);
VG_(message)(Vg_UserMsg,
- " v 2.96 or 3.0.X. To suppress, use: --workaround-gcc296-bugs=yes");
+ " 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 free'd", a);
}
break;
case Freed: case Mallocd: case UserG: {
@@ -255,7 +255,7 @@
relative = "inside";
}
VG_(message)(Vg_UserMsg,
- " Address 0x%x is %d bytes %s a block of size %d %s",
+ " Address 0x%x is %d bytes %s a block of size %d %s",
a, delta, relative,
ai->blksize,
ai->akind==Mallocd ? "alloc'd"
diff --git a/memcheck/tests/badaddrvalue.stderr.exp b/memcheck/tests/badaddrvalue.stderr.exp
index 8172954..f71df0b 100644
--- a/memcheck/tests/badaddrvalue.stderr.exp
+++ b/memcheck/tests/badaddrvalue.stderr.exp
@@ -1,11 +1,11 @@
Invalid write of size 1
at 0x........: main (badaddrvalue.c:8)
- Address 0x........ is 1 bytes before a block of size 8 alloc'd
+ Address 0x........ is 1 bytes before a block of size 8 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badaddrvalue.c:7)
Invalid read of size 1
at 0x........: main (badaddrvalue.c:9)
- Address 0x........ is 1 bytes before a block of size 8 alloc'd
+ Address 0x........ is 1 bytes before a block of size 8 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badaddrvalue.c:7)
diff --git a/memcheck/tests/badfree-2trace.stderr.exp b/memcheck/tests/badfree-2trace.stderr.exp
index 6308cc4..48ab64e 100644
--- a/memcheck/tests/badfree-2trace.stderr.exp
+++ b/memcheck/tests/badfree-2trace.stderr.exp
@@ -1,9 +1,9 @@
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 free'd
Invalid free() / delete / delete[]
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (badfree.c:15)
- Address 0x........ is on thread 1's stack
+ Address 0x........ is on thread 1's stack
diff --git a/memcheck/tests/badfree.stderr.exp b/memcheck/tests/badfree.stderr.exp
index 6308cc4..48ab64e 100644
--- a/memcheck/tests/badfree.stderr.exp
+++ b/memcheck/tests/badfree.stderr.exp
@@ -1,9 +1,9 @@
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 free'd
Invalid free() / delete / delete[]
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (badfree.c:15)
- Address 0x........ is on thread 1's stack
+ Address 0x........ is on thread 1's stack
diff --git a/memcheck/tests/badjump.stderr.exp b/memcheck/tests/badjump.stderr.exp
index f18c11d..2bec474 100644
--- a/memcheck/tests/badjump.stderr.exp
+++ b/memcheck/tests/badjump.stderr.exp
@@ -3,10 +3,10 @@
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 free'd
Process terminating with default action of signal 11 (SIGSEGV): dumping core
- address not mapped to object at address 0x........
+ Address not mapped to object at address 0x........
at 0x........: ???
by 0x........: __libc_start_main (...libc...)
by 0x........: ...
diff --git a/memcheck/tests/badrw.stderr.exp b/memcheck/tests/badrw.stderr.exp
index 4ac32de..a6f168c 100644
--- a/memcheck/tests/badrw.stderr.exp
+++ b/memcheck/tests/badrw.stderr.exp
@@ -1,35 +1,35 @@
Invalid read of size 4
at 0x........: main (badrw.c:12)
- Address 0x........ is 4 bytes before a block of size 10 alloc'd
+ Address 0x........ is 4 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid write of size 4
at 0x........: main (badrw.c:12)
- Address 0x........ is 4 bytes before a block of size 10 alloc'd
+ Address 0x........ is 4 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid read of size 2
at 0x........: main (badrw.c:13)
- Address 0x........ is 4 bytes before a block of size 10 alloc'd
+ Address 0x........ is 4 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid write of size 2
at 0x........: main (badrw.c:13)
- Address 0x........ is 4 bytes before a block of size 10 alloc'd
+ Address 0x........ is 4 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid read of size 1
at 0x........: main (badrw.c:14)
- Address 0x........ is 1 bytes before a block of size 10 alloc'd
+ Address 0x........ is 1 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
Invalid write of size 1
at 0x........: main (badrw.c:14)
- Address 0x........ is 1 bytes before a block of size 10 alloc'd
+ Address 0x........ is 1 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (badrw.c:5)
diff --git a/memcheck/tests/buflen_check.stderr.exp b/memcheck/tests/buflen_check.stderr.exp
index 9fec99c..e733afe 100644
--- a/memcheck/tests/buflen_check.stderr.exp
+++ b/memcheck/tests/buflen_check.stderr.exp
@@ -2,12 +2,12 @@
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 free'd
Syscall param socketcall.getsockname(namelen_in) contains uninitialised or 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 free'd
getsockname(1) failed
getsockname(2) failed
diff --git a/memcheck/tests/custom_alloc.stderr.exp b/memcheck/tests/custom_alloc.stderr.exp
index 6dd60a4..c04fabc 100644
--- a/memcheck/tests/custom_alloc.stderr.exp
+++ b/memcheck/tests/custom_alloc.stderr.exp
@@ -1,6 +1,6 @@
Invalid write of size 4
at 0x........: main (custom_alloc.c:79)
- Address 0x........ is 48 bytes inside a block of size 100000 client-defined
+ Address 0x........ is 48 bytes inside a block of size 100000 client-defined
at 0x........: get_superblock (custom_alloc.c:25)
by 0x........: custom_alloc (custom_alloc.c:40)
by 0x........: main (custom_alloc.c:76)
@@ -8,18 +8,18 @@
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 free'd
Mismatched free() / delete / delete []
at 0x........: custom_free (custom_alloc.c:54)
by 0x........: main (custom_alloc.c:86)
- Address 0x........ is 0 bytes inside a block of size 40 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 40 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (custom_alloc.c:85)
Invalid read of size 4
at 0x........: main (custom_alloc.c:89)
- Address 0x........ is 8 bytes inside a block of size 100000 client-defined
+ Address 0x........ is 8 bytes inside a block of size 100000 client-defined
at 0x........: get_superblock (custom_alloc.c:25)
by 0x........: custom_alloc (custom_alloc.c:40)
by 0x........: main (custom_alloc.c:76)
diff --git a/memcheck/tests/doublefree.stderr.exp b/memcheck/tests/doublefree.stderr.exp
index 8a95252..364f738 100644
--- a/memcheck/tests/doublefree.stderr.exp
+++ b/memcheck/tests/doublefree.stderr.exp
@@ -1,6 +1,6 @@
Invalid free() / delete / delete[]
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (doublefree.c:10)
- Address 0x........ is 0 bytes inside a block of size 177 free'd
+ Address 0x........ is 0 bytes inside a block of size 177 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (doublefree.c:10)
diff --git a/memcheck/tests/errs1.stderr.exp b/memcheck/tests/errs1.stderr.exp
index 9aa2a4a..7b5f0fe 100644
--- a/memcheck/tests/errs1.stderr.exp
+++ b/memcheck/tests/errs1.stderr.exp
@@ -3,7 +3,7 @@
by 0x........: bbb (errs1.c:9)
by 0x........: aaa (errs1.c:10)
by 0x........: main (errs1.c:17)
- Address 0x........ is 1 bytes before a block of size 10 alloc'd
+ Address 0x........ is 1 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: zzzzzzz (errs1.c:12)
by 0x........: yyy (errs1.c:13)
@@ -14,7 +14,7 @@
by 0x........: bbb (errs1.c:9)
by 0x........: aaa (errs1.c:10)
by 0x........: main (errs1.c:17)
- Address 0x........ is 1 bytes before a block of size 10 alloc'd
+ Address 0x........ is 1 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: zzzzzzz (errs1.c:12)
by 0x........: yyy (errs1.c:13)
diff --git a/memcheck/tests/exitprog.stderr.exp b/memcheck/tests/exitprog.stderr.exp
index b19f777..c1fa55b 100644
--- a/memcheck/tests/exitprog.stderr.exp
+++ b/memcheck/tests/exitprog.stderr.exp
@@ -1,5 +1,5 @@
Invalid write of size 1
at 0x........: main (exitprog.c:18)
- Address 0x........ is 0 bytes after a block of size 1000000 alloc'd
+ Address 0x........ is 0 bytes after a block of size 1000000 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (exitprog.c:15)
diff --git a/memcheck/tests/fprw.stderr.exp b/memcheck/tests/fprw.stderr.exp
index c6cd31f..f440e83 100644
--- a/memcheck/tests/fprw.stderr.exp
+++ b/memcheck/tests/fprw.stderr.exp
@@ -12,35 +12,35 @@
Invalid read of size 8
at 0x........: main (fprw.c:20)
- Address 0x........ is 0 bytes inside a block of size 8 free'd
+ Address 0x........ is 0 bytes inside a block of size 8 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:18)
Invalid write of size 8
at 0x........: main (fprw.c:20)
- Address 0x........ is 0 bytes inside a block of size 8 free'd
+ Address 0x........ is 0 bytes inside a block of size 8 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:18)
Invalid read of size 4
at 0x........: main (fprw.c:21)
- Address 0x........ is 0 bytes inside a block of size 4 free'd
+ Address 0x........ is 0 bytes inside a block of size 4 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:19)
Invalid write of size 4
at 0x........: main (fprw.c:21)
- Address 0x........ is 0 bytes inside a block of size 4 free'd
+ Address 0x........ is 0 bytes inside a block of size 4 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:19)
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 free'd
Invalid write of size 8
at 0x........: main (fprw.c:24)
- Address 0x........ is 0 bytes inside a block of size 4 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 4 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (fprw.c:23)
diff --git a/memcheck/tests/fwrite.stderr.exp b/memcheck/tests/fwrite.stderr.exp
index 0466b8f..4cf2593 100644
--- a/memcheck/tests/fwrite.stderr.exp
+++ b/memcheck/tests/fwrite.stderr.exp
@@ -2,6 +2,6 @@
at 0x........: __libc_write (...libc...)
by 0x........: __libc_start_main (...libc...)
by 0x........: ...
- Address 0x........ is 0 bytes inside a block of size 10 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (fwrite.c:6)
diff --git a/memcheck/tests/inline.stderr.exp b/memcheck/tests/inline.stderr.exp
index 6b46a9d..639b31e 100644
--- a/memcheck/tests/inline.stderr.exp
+++ b/memcheck/tests/inline.stderr.exp
@@ -1,6 +1,6 @@
Invalid read of size 4
at 0x........: addemup (inline.c:10)
by 0x........: main (inline.c:18)
- Address 0x........ is 0 bytes after a block of size 40 alloc'd
+ Address 0x........ is 0 bytes after a block of size 40 alloc'd
at 0x........: calloc (vg_replace_malloc.c:...)
by 0x........: main (inline.c:17)
diff --git a/memcheck/tests/malloc1.stderr.exp b/memcheck/tests/malloc1.stderr.exp
index 0533f9b..9739e92 100644
--- a/memcheck/tests/malloc1.stderr.exp
+++ b/memcheck/tests/malloc1.stderr.exp
@@ -1,7 +1,7 @@
Invalid write of size 1
at 0x........: really (malloc1.c:20)
by 0x........: main (malloc1.c:9)
- Address 0x........ is 1 bytes inside a block of size 10 free'd
+ Address 0x........ is 1 bytes inside a block of size 10 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: really (malloc1.c:19)
by 0x........: main (malloc1.c:9)
@@ -9,7 +9,7 @@
Invalid write of size 1
at 0x........: really (malloc1.c:23)
by 0x........: main (malloc1.c:9)
- Address 0x........ is 1 bytes before a block of size 10 alloc'd
+ Address 0x........ is 1 bytes before a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: really (malloc1.c:21)
by 0x........: main (malloc1.c:9)
diff --git a/memcheck/tests/malloc2.stderr.exp b/memcheck/tests/malloc2.stderr.exp
index 1a7e2ea..29ad572 100644
--- a/memcheck/tests/malloc2.stderr.exp
+++ b/memcheck/tests/malloc2.stderr.exp
@@ -1,12 +1,12 @@
Invalid write of size 1
at 0x........: main (malloc2.c:39)
- Address 0x........ is 0 bytes inside a block of size 429 free'd
+ Address 0x........ is 0 bytes inside a block of size 429 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (malloc2.c:38)
Invalid free() / delete / delete[]
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (malloc2.c:43)
- Address 0x........ is 0 bytes inside a block of size 429 free'd
+ Address 0x........ is 0 bytes inside a block of size 429 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (malloc2.c:38)
diff --git a/memcheck/tests/memalign_test.stderr.exp b/memcheck/tests/memalign_test.stderr.exp
index 74e7bf9..a43369c 100644
--- a/memcheck/tests/memalign_test.stderr.exp
+++ b/memcheck/tests/memalign_test.stderr.exp
@@ -1,6 +1,6 @@
Invalid free() / delete / delete[]
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (memalign_test.c:17)
- Address 0x........ is 0 bytes inside a block of size 111110 free'd
+ Address 0x........ is 0 bytes inside a block of size 111110 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (memalign_test.c:15)
diff --git a/memcheck/tests/mismatches.stderr.exp b/memcheck/tests/mismatches.stderr.exp
index 9da033f..283b65f 100644
--- a/memcheck/tests/mismatches.stderr.exp
+++ b/memcheck/tests/mismatches.stderr.exp
@@ -1,41 +1,41 @@
Mismatched free() / delete / delete []
at 0x........: operator delete(void*) (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:6)
- Address 0x........ is 0 bytes inside a block of size 10 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:5)
Mismatched free() / delete / delete []
at 0x........: operator delete[](void*) (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:8)
- Address 0x........ is 0 bytes inside a block of size 10 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 10 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:7)
Mismatched free() / delete / delete []
at 0x........: operator delete(void*) (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:13)
- Address 0x........ is 0 bytes inside a block of size 40 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 40 alloc'd
at 0x........: operator new[](unsigned) (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:12)
Mismatched free() / delete / delete []
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:15)
- Address 0x........ is 0 bytes inside a block of size 40 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 40 alloc'd
at 0x........: operator new[](unsigned) (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:14)
Mismatched free() / delete / delete []
at 0x........: operator delete[](void*) (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:20)
- Address 0x........ is 0 bytes inside a block of size 4 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 4 alloc'd
at 0x........: operator new(unsigned) (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:19)
Mismatched free() / delete / delete []
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:22)
- Address 0x........ is 0 bytes inside a block of size 4 alloc'd
+ Address 0x........ is 0 bytes inside a block of size 4 alloc'd
at 0x........: operator new(unsigned) (vg_replace_malloc.c:...)
by 0x........: main (mismatches.cpp:21)
diff --git a/memcheck/tests/realloc3.stderr.exp b/memcheck/tests/realloc3.stderr.exp
index 70ca015..51e5da3 100644
--- a/memcheck/tests/realloc3.stderr.exp
+++ b/memcheck/tests/realloc3.stderr.exp
@@ -1,17 +1,17 @@
Invalid read of size 4
at 0x........: main (realloc3.c:23)
- Address 0x........ is 15 bytes after a block of size 5 alloc'd
+ Address 0x........ is 15 bytes after a block of size 5 alloc'd
at 0x........: realloc (vg_replace_malloc.c:...)
by 0x........: main (realloc3.c:19)
Invalid read of size 4
at 0x........: main (realloc3.c:24)
- Address 0x........ is 15 bytes after a block of size 5 alloc'd
+ Address 0x........ is 15 bytes after a block of size 5 alloc'd
at 0x........: realloc (vg_replace_malloc.c:...)
by 0x........: main (realloc3.c:20)
Invalid read of size 4
at 0x........: main (realloc3.c:25)
- Address 0x........ is 15 bytes after a block of size 5 alloc'd
+ Address 0x........ is 15 bytes after a block of size 5 alloc'd
at 0x........: realloc (vg_replace_malloc.c:...)
by 0x........: main (realloc3.c:21)
diff --git a/memcheck/tests/sigaltstack.stderr.exp b/memcheck/tests/sigaltstack.stderr.exp
index ae99b44..6c0b2fc 100644
--- a/memcheck/tests/sigaltstack.stderr.exp
+++ b/memcheck/tests/sigaltstack.stderr.exp
@@ -2,7 +2,7 @@
setting sigaction
Syscall param sigaction(act) contains uninitialised or unaddressable byte(s)
at 0x........: __libc_sigaction (...libc...)
- Address 0x........ is on thread 1's stack
+ Address 0x........ is on thread 1's stack
res = 0
raising the signal
caught signal, local var is on 0x........
diff --git a/memcheck/tests/signal2.stderr.exp b/memcheck/tests/signal2.stderr.exp
index 3437d9f..1ff871d 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 free'd
diff --git a/memcheck/tests/suppfree.stderr.exp b/memcheck/tests/suppfree.stderr.exp
index cb70723..8beea07 100644
--- a/memcheck/tests/suppfree.stderr.exp
+++ b/memcheck/tests/suppfree.stderr.exp
@@ -3,7 +3,7 @@
by 0x........: ddd (suppfree.c:7)
by 0x........: ccc (suppfree.c:12)
by 0x........: bbb (suppfree.c:17)
- Address 0x........ is 0 bytes inside a block of size 10 free'd
+ Address 0x........ is 0 bytes inside a block of size 10 free'd
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: ddd (suppfree.c:6)
by 0x........: ccc (suppfree.c:12)
diff --git a/memcheck/tests/weirdioctl.stderr.exp b/memcheck/tests/weirdioctl.stderr.exp
index 8303590..42ea90a 100644
--- a/memcheck/tests/weirdioctl.stderr.exp
+++ b/memcheck/tests/weirdioctl.stderr.exp
@@ -2,4 +2,4 @@
at 0x........: __ioctl (in /...libc...)
by 0x........: __libc_start_main (...libc...)
by 0x........: ...
- Address 0x........ is on thread 1's stack
+ Address 0x........ is on thread 1's stack
diff --git a/memcheck/tests/writev.stderr.exp b/memcheck/tests/writev.stderr.exp
index ee7b269..acbd5f3 100644
--- a/memcheck/tests/writev.stderr.exp
+++ b/memcheck/tests/writev.stderr.exp
@@ -3,19 +3,19 @@
Syscall param writev(vector[...]) contains uninitialised or unaddressable byte(s)
at 0x........: __libc_writev (...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 free'd
Received EFAULT as expected
Syscall param writev(vector) contains uninitialised or unaddressable byte(s)
at 0x........: __libc_writev (...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 free'd
Received EINVAL as expected
Syscall param readv(vector) contains uninitialised or unaddressable byte(s)
at 0x........: __libc_readv (...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 free'd
Received EINVAL as expected
ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)