@@ -248,7 +248,7 @@ func followLinks(opener Opener, filePath string, visited map[string]bool) (io.Re
 		if err != nil {
 			return nil, err
 		}
-		if hdr.Name == filePath {
+		if path.Clean(hdr.Name) == path.Clean(filePath) {
 			if hdr.Typeflag == tar.TypeSymlink || hdr.Typeflag == tar.TypeLink {
 				currentDir := filepath.Dir(filePath)
 				return followLinks(opener, path.Join(currentDir, path.Clean(hdr.Linkname)), visited)
 
@@ -241,3 +241,35 @@ func TestManifestEmptyDiffIDs(t *testing.T) {
 		t.Errorf("img.Manifest(): expected error mentioning diff_ids, got: %v", err)
 	}
 }
+
+func TestLoadManifestPrefixPath(t *testing.T) {
+	var buf bytes.Buffer
+	tw := tar.NewWriter(&buf)
+	manifestBytes := []byte(`[]`)
+	if err := tw.WriteHeader(&tar.Header{
+		Name: "./manifest.json",
+		Mode: 0644,
+		Size: int64(len(manifestBytes)),
+	}); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := tw.Write(manifestBytes); err != nil {
+		t.Fatal(err)
+	}
+	if err := tw.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	content := buf.Bytes()
+	opener := func() (io.ReadCloser, error) {
+		return io.NopCloser(bytes.NewReader(content)), nil
+	}
+
+	manifest, err := LoadManifest(opener)
+	if err != nil {
+		t.Fatalf("LoadManifest() failed: %v", err)
+	}
+	if len(manifest) != 0 {
+		t.Errorf("expected empty manifest, got %v", manifest)
+	}
+}
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ func followLinks(opener Opener, filePath string, visited map[string]bool) (io.Re`
`248`	`248`	`if err != nil {`
`249`	`249`	`return nil, err`
`250`	`250`	`}`
`251`		`- if hdr.Name == filePath {`
	`251`	`+ if path.Clean(hdr.Name) == path.Clean(filePath) {`
`252`	`252`	`if hdr.Typeflag == tar.TypeSymlink \|\| hdr.Typeflag == tar.TypeLink {`
`253`	`253`	`currentDir := filepath.Dir(filePath)`
`254`	`254`	`return followLinks(opener, path.Join(currentDir, path.Clean(hdr.Linkname)), visited)`