|
From: <sv...@va...> - 2015-06-11 19:57:50
|
Author: philippe
Date: Thu Jun 11 20:57:42 2015
New Revision: 15333
Log:
Fix 348949 Bogus "ERROR: --ignore-ranges: suspiciously large range"
Patch from Mark Harris
Modified:
trunk/NEWS
trunk/memcheck/mc_main.c
trunk/memcheck/tests/err_disable_arange1.stderr.exp
trunk/memcheck/tests/err_disable_arange1.vgtest
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Thu Jun 11 20:57:42 2015
@@ -236,6 +236,7 @@
348728 Fix broken check for VIDIOC_G_ENC_INDEX
348748 Fix redundant condition
348890 Fix clang warning about unsupported --param inline-unit-growth=900
+348949 Bogus "ERROR: --ignore-ranges: suspiciously large range"
n-i-bz Provide implementations of certain compiler builtins to support
compilers who may not provide those
n-i-bz Old STABS code is still being compiled, but never used. Remove it.
Modified: trunk/memcheck/mc_main.c
==============================================================================
--- trunk/memcheck/mc_main.c (original)
+++ trunk/memcheck/mc_main.c Thu Jun 11 20:57:42 2015
@@ -5496,11 +5496,11 @@
gIgnoredAddressRanges, i );
tl_assert(key_min <= key_max);
UWord limit = 0x4000000; /* 64M - entirely arbitrary limit */
- if (key_max - key_min > limit) {
+ if (key_max - key_min > limit && val == IAR_CommandLine) {
VG_(message)(Vg_DebugMsg,
"ERROR: --ignore-ranges: suspiciously large range:\n");
VG_(message)(Vg_DebugMsg,
- " 0x%lx-0x%lx (size %ld)\n", key_min, key_max,
+ " 0x%lx-0x%lx (size %lu)\n", key_min, key_max,
key_max - key_min + 1);
return False;
}
Modified: trunk/memcheck/tests/err_disable_arange1.stderr.exp
==============================================================================
--- trunk/memcheck/tests/err_disable_arange1.stderr.exp (original)
+++ trunk/memcheck/tests/err_disable_arange1.stderr.exp Thu Jun 11 20:57:42 2015
@@ -32,5 +32,5 @@
WARNING: address error disablement range(s) still in force,
WARNING: possibly as a result of some mistake in the use of the
WARNING: VALGRIND_{DISABLE,ENABLE}_ERROR_REPORTING_IN_RANGE macros.
- [1] 0x........-0x........ ClientReq
- [3] 0x........-0x........ ClientReq
+ [4] 0x........-0x........ ClientReq
+ [6] 0x........-0x........ ClientReq
Modified: trunk/memcheck/tests/err_disable_arange1.vgtest
==============================================================================
--- trunk/memcheck/tests/err_disable_arange1.vgtest (original)
+++ trunk/memcheck/tests/err_disable_arange1.vgtest Thu Jun 11 20:57:42 2015
@@ -1,2 +1,2 @@
prog: err_disable_arange1
-vgopts: -q
+vgopts: -q --ignore-ranges=0x1000-0x1fff,0x0000-0x00ff
|