Fix false positive in `dwz` lines

diff --git a/NEWS b/NEWS
index df6f7a5bd16cda6fa3a74c0022712d993ecb577f..097d76b24a5a76a950c9d804002448ccc66c5264 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 NEWS
 ====
 
+Version 0.XX
+------------
+
+- Fix false positive in `dwz` lines; reported by Raphaël Hertzog (Debian Bug
+  #948009).
+
+
 Version 0.10
 ------------
 

diff --git a/bin/blhc b/bin/blhc
index 5fabc39e4bf8f9d090c250eec61a2a07d0a3a721..e84b12b5e6abf504810b0c943b7350507ac69df9 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -1061,6 +1061,7 @@ foreach my $file (@ARGV) {
             # look like a compiler executable thus causing the line to be
             # treated as a normal compiler line.
             next if $line =~ m{^\s*rm\s+};
+            next if $line =~ m{^\s*dwz\s+};
             # Some build systems emit "gcc > file".
             next if $line =~ m{$cc_regex_normal\s*>\s*\S+}o;
             # Hex output may contain "cc".

diff --git a/t/logs/false-positives b/t/logs/false-positives
index d21f4f7c4f21f6950ef20bcdc1ed3b3e94454b6d..8e7d6c37fb68a1a200f1ca99fc13b9878dbe4f64 100644 (file)
--- a/t/logs/false-positives
+++ b/t/logs/false-positives
@@ -8,6 +8,9 @@ swig -Wall -c++ -python test.i
 
 rm -f afl-gcc afl-as afl-fuzz afl-showmap as afl-g++ afl-clang afl-clang++ *.o *~ a.out core core.[1-9][0-9]* *.stackdump test .test test-instr .test-instr0 .test-instr1
 
+       dwz -mdebian/afl\+\+/usr/lib/debug/.dwz/x86_64-linux-gnu/afl\+\+.debug -M/usr/lib/debug/.dwz/x86_64-linux-gnu/afl\+\+.debug -- debian/afl\+\+/usr/bin/afl-analyze debian/afl\+\+/usr/bin/afl-fuzz debian/afl\+\+/usr/bin/afl-gcc debian/afl\+\+/usr/bin/afl-gotcpu debian/afl\+\+/usr/bin/afl-showmap debian/afl\+\+/usr/bin/afl-tmin debian/afl\+\+/usr/lib/afl/afl-as debian/afl\+\+/usr/lib/afl/libdislocator.so debian/afl\+\+/usr/lib/afl/libtokencap.so
+       dwz -mdebian/afl\+\+-clang/usr/lib/debug/.dwz/x86_64-linux-gnu/afl\+\+-clang.debug -M/usr/lib/debug/.dwz/x86_64-linux-gnu/afl\+\+-clang.debug -- debian/afl\+\+-clang/usr/bin/afl-clang-fast debian/afl\+\+-clang/usr/lib/afl/afl-llvm-pass.so
+
 # "Missing" flags in comments should be ignored.
 # gcc -E tag_tree.list does not work, so use a .c name