From: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Date: Wed, 11 May 2011 16:45:52 +0000 (+0000)
Subject: Fixed bug 272661
X-Git-Tag: svn/VALGRIND_3_7_0~490
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8498c6ff81613c22d51cb697e980add1e7eb9201;p=thirdparty%2Fvalgrind.git

Fixed bug 272661

Paths should be quoted in regexps (in callgrind_annotate).

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

diff --git a/callgrind/callgrind_annotate.in b/callgrind/callgrind_annotate.in
index 9d711e2ec9..e2e2f5f2eb 100644
--- a/callgrind/callgrind_annotate.in
+++ b/callgrind/callgrind_annotate.in
@@ -607,7 +607,7 @@ sub read_input_file()
                 if (defined $curr_file);
 
             $curr_file = uncompressed_name("fl",$1);
-	    $curr_file =~ s/^$pwd//;
+            $curr_file =~ s/^\Q$pwd\E//;
             $curr_file_ind_CCs = $all_ind_CCs{$curr_file};
             $curr_file_ind_CCs = {} unless (defined $curr_file_ind_CCs);
 
@@ -617,7 +617,7 @@ sub read_input_file()
             $all_ind_CCs{$curr_file} = $curr_file_ind_CCs;
 
             $curr_file = uncompressed_name("fl",$2);
-	    $curr_file =~ s/^$pwd//;
+            $curr_file =~ s/^\Q$pwd\E//;
             $curr_name = "$curr_file:$curr_fn";
             $curr_file_ind_CCs = $all_ind_CCs{$curr_file};
             $curr_file_ind_CCs = {} unless (defined $curr_file_ind_CCs);