patch: fixup

Author: rsc

patch/git.go

@@ -71,6 +71,9 @@ func ParseGitBinary(raw []byte) (Diff, error) {
 
 	for {
 		var first []byte
+		if len(raw) == 0 {
+			return nil, errors.New("missing Git binary patch header")
+		}
 		first, raw, _ = getLine(raw, 1)
 		first = bytes.TrimSpace(first)
 		if s, ok := skip(first, "index "); ok {

patch/patch.go

@@ -157,6 +157,9 @@ func Parse(text []byte) (*Set, error) {
 				p.NewMode = m
 				continue
 			}
+			if _, ok := skip(l, "similarity index "); ok {
+				continue
+			}
 			if s, ok := skip(l, "rename from "); ok && len(s) > 0 {
 				p.Src = string(s)
 				p.Verb = Rename
@@ -217,6 +220,9 @@ func Parse(text []byte) (*Set, error) {
 			if hasPrefix(l, "index ") {
 				continue
 			}
+			if len(l) == 0 {
+				continue
+			}
 			return nil, SyntaxError("unexpected patch header line: " + string(l))
 		}
 		if p.Diff == nil {