Merge pull request #67 from rauls5382/deleted

Parse correctly mappings where the binary has been deleted

profile/legacy_profile.go

@@ -57,12 +57,12 @@ var (
 	cHex           = `(?:0x)?([[:xdigit:]]+)`
 	cHexRange      = `\s*` + cHex + `[\s-]?` + oSpace + cHex + `:?`
 	cSpaceString   = `(?:\s+(\S+))?`
-	cSpaceHex      = `\s+([[:xdigit:]]+)`
+	cSpaceHex      = `(?:\s+([[:xdigit:]]+))?`
 	cSpaceAtOffset = `(?:\s+\(@([[:xdigit:]]+)\))?`
 	cPerm          = `(?:\s+([-rwxp]+))?`
 
-	procMapsRE  = regexp.MustCompile(`^` + cHexRange + cPerm + cSpaceHex + hexPair + spaceDigits + cSpaceString + `\s*$`)
-	briefMapsRE = regexp.MustCompile(`^` + cHexRange + cPerm + cSpaceString + cSpaceAtOffset + cSpaceString + `\s*$`)
+	procMapsRE  = regexp.MustCompile(`^` + cHexRange + cPerm + cSpaceHex + hexPair + spaceDigits + cSpaceString)
+	briefMapsRE = regexp.MustCompile(`^` + cHexRange + cPerm + cSpaceString + cSpaceAtOffset + cSpaceHex)
 )
 
 func isSpaceOrComment(line string) bool {

profile/legacy_profile_test.go

@@ -157,6 +157,14 @@ func TestParseMappingEntry(t *testing.T) {
 				File:   "/foo/bin",
 			},
 		},
+		{
+			entry: "  02e00000-02e8a000: /foo/bin (deleted)",
+			want: &Mapping{
+				Start: 0x2e00000,
+				Limit: 0x2e8a000,
+				File:  "/foo/bin",
+			},
+		},
 		{
 			entry: "  02e00000-02e8a000: /foo/bin",
 			want: &Mapping{
@@ -218,7 +226,7 @@ func TestParseMappingEntry(t *testing.T) {
 	} {
 		got, err := parseMappingEntry(test.entry)
 		if err != nil {
-			t.Error(err)
+			t.Errorf("%s: %v", test.entry, err)
 		}
 		if !reflect.DeepEqual(test.want, got) {
 			t.Errorf("%s want=%v got=%v", test.entry, test.want, got)