Check that file version matches before applying filters.

Signed-off-by:  Henry Cox <[email protected]>

Author: henry2cox

bin/genhtml

@@ -4310,7 +4310,7 @@ sub _load
             '' ne $version) {
             if (defined($currentVersion)) {
                 lcovutil::checkVersionMatch($repo_path, $version,
-                                            $currentVersion);
+                                            $currentVersion, 'load');
             } else {
                 lcovutil::ignorable_error($lcovutil::ERROR_VERSION,
                     "'$repo_path': computed '$version' but version not defined in 'current' data file "

lib/lcovutil.pm

@@ -1803,7 +1803,7 @@ sub extractFileVersion
 
 sub checkVersionMatch
 {
-    my ($filename, $me, $you) = @_;
+    my ($filename, $me, $you, $reason) = @_;
 
     my $match;
     if (@extractVersionScript) {
@@ -1816,10 +1816,12 @@ sub checkVersionMatch
         $match = $me eq $you;    # simple string compare
     }
     lcovutil::ignorable_error($ERROR_VERSION,
+                          (defined($reason) ? ($reason . ' ') : '') .
                               "$filename: revision control version mismatch: " .
-                                  (defined($me) ? $me : 'undef') .
-                                  ' <- ' . (defined($you) ? $you : 'undef'))
+                              (defined($me) ? $me : 'undef') .
+                              ' <- ' . (defined($you) ? $you : 'undef'))
         unless $match;
+    return $match;
 }
 
 #
@@ -3828,7 +3830,7 @@ sub merge
         $brOp    = \&BranchData::difference;
     }
 
-    lcovutil::checkVersionMatch($filename, $me, $you);
+    lcovutil::checkVersionMatch($filename, $me, $you, 'merge');
     my $changed = 0;
 
     foreach my $name ($info->test()->keylist()) {
@@ -4637,6 +4639,17 @@ sub _filterFile
     } else {
         $srcReader->close();
     }
+    my $fileVersion = lcovutil::extractFileVersion($source_file)
+        if $srcReader->notEmpty();
+    if (defined($fileVersion) &&
+        defined($traceInfo->version())
+        &&
+        !lcovutil::checkVersionMatch($source_file, $traceInfo->version(),
+                                     $fileVersion, 'filter')
+    ) {
+        lcovutil::info(1, 'skip filtering due to version mismatch\n');
+        return ($traceInfo, 0);
+    }
 
     my $modified = 0;
     if (defined($lcovutil::func_coverage) &&

tests/gendiffcov/simple/script.sh

@@ -208,6 +208,23 @@ if [ 0 != $? ] ; then
         exit 1
     fi
 fi
+# test filter with differing version
+$COVER $LCOV_HOME/bin/lcov $LCOV_OPTS --output filt.info --filter branch,line -a baseline2.info $IGNORE
+if [ 0 == $? ] ; then
+    echo "ERROR: filter with mismatched version did not fail"
+    status=1
+    if [ 0 == $KEEP_GOING ] ; then
+        exit 1
+    fi
+fi
+$COVER $LCOV_HOME/bin/lcov $LCOV_OPTS --output filt.info --filter branch,line -a baseline2.info $IGNORE --ignore version
+if [ 0 != $? ] ; then
+    echo "ERROR: ignore error filer with mismatched version failed"
+    status=1
+    if [ 0 == $KEEP_GOING ] ; then
+        exit 1
+    fi
+fi
 # run genhtml with mismatched version
 echo genhtml $DIFFCOV_OPTS baseline2.info --output-directory ./mismatched
 $COVER $LCOV_HOME/bin/genhtml $DIFFCOV_OPTS baseline2.info --output-directory ./mismatched