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 9d711e2ec9c944c315cca570ffc2d2c4d8ae2a69..e2e2f5f2ebfd22506b0b70453349968d7e54becb 100644 (file)
--- 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);