Fix 348949 Bogus "ERROR: --ignore-ranges: suspiciously large range"

Patch from Mark Harris

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15333

diff --git a/NEWS b/NEWS
index d0f922612d7a732555df7344569a02ca48f8408c..d72f3c86bcba55ae9ec784b9669ca305fe9568eb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -236,6 +236,7 @@ where XXXXXX is the bug number as listed below.
 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.

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index f0850445596cc97e28ae2e1e87b69d52eb5e0b42..0d6ebcd3a26fd7442c14e1b66ea0b4a5a4676c7a 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -5496,11 +5496,11 @@ static Bool mc_process_cmd_line_options(const HChar* arg)
                                 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;
             }

diff --git a/memcheck/tests/err_disable_arange1.stderr.exp b/memcheck/tests/err_disable_arange1.stderr.exp
index 8e979d2c7984f159c9e3f8185cf216d6e73b0cef..cb6a2db620febb47bc66944362222abe1462aa98 100644 (file)
--- a/memcheck/tests/err_disable_arange1.stderr.exp
+++ b/memcheck/tests/err_disable_arange1.stderr.exp
@@ -32,5 +32,5 @@ WARNING: exiting program has the following client-requested
 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

diff --git a/memcheck/tests/err_disable_arange1.vgtest b/memcheck/tests/err_disable_arange1.vgtest
index 48ba25f3e060be3e6976fb4885fcce71274b0c50..a4377099666afb69b47f3e5c47fbf9226c595935 100644 (file)
--- a/memcheck/tests/err_disable_arange1.vgtest
+++ b/memcheck/tests/err_disable_arange1.vgtest
@@ -1,2 +1,2 @@
 prog: err_disable_arange1
-vgopts: -q
+vgopts: -q --ignore-ranges=0x1000-0x1fff,0x0000-0x00ff