Fix parsing of non-extended file headers and lines starting with --

diff/diff_test.go

@@ -73,6 +73,7 @@ func TestParseHunksAndPrintHunks(t *testing.T) {
 		{filename: "empty_new.diff"},
 		{filename: "oneline_hunk.diff"},
 		{filename: "empty.diff"},
+		{filename: "sample_hunk_lines_start_with_minuses.diff"},
 	}
 	for _, test := range tests {
 		diffData, err := ioutil.ReadFile(filepath.Join("testdata", test.filename))

diff/parse.go

@@ -61,6 +61,7 @@ func (r *MultiFileDiffReader) ReadFile() (*FileDiff, error) {
 			if e.Err == ErrNoFileHeader || e.Err == ErrExtendedHeadersEOF {
 				return nil, io.EOF
 			}
+			return nil, err
 
 		case OverflowError:
 			r.nextFileFirstLine = []byte(e)
@@ -513,9 +514,22 @@ func (r *HunksReader) ReadHunk() (*Hunk, error) {
 			r.hunk.Section = section
 		} else {
 			// Read hunk body line.
+
+			// If the line starts with `---` and the next one with `+++` we're
+			// looking at a non-extended file header and need to abort.
+			if bytes.HasPrefix(line, []byte("---")) {
+				ok, err := nextLineHasPrefix(r.reader, []byte("+++"))
+				if err != nil {
+					return r.hunk, err
+				}
+				if ok {
+					return r.hunk, &ParseError{r.line, r.offset, &ErrBadHunkLine{Line: line}}
+				}
+			}
+
+			// If the line starts with the hunk prefix, this hunk is complete.
 			if bytes.HasPrefix(line, hunkPrefix) {
-				// Saw start of new hunk, so this hunk is
-				// complete. But we've already read in the next hunk's
+				// But we've already read in the next hunk's
 				// header, so we need to be sure that the next call to
 				// ReadHunk starts with that header.
 				r.nextHunkHeaderLine = line
@@ -527,7 +541,7 @@ func (r *HunksReader) ReadHunk() (*Hunk, error) {
 				return r.hunk, nil
 			}
 
-			if len(line) >= 1 && (!linePrefix(line[0]) || bytes.HasPrefix(line, []byte("--- "))) {
+			if len(line) >= 1 && !linePrefix(line[0]) {
 				// Bad hunk header line. If we're reading a multi-file
 				// diff, this may be the end of the current
 				// file. Return a "rich" error that lets our caller
@@ -579,6 +593,16 @@ func linePrefix(c byte) bool {
 	return false
 }
 
+// nextLineHasPrefix peeks into the given reader to check whether the next
+// bytes match the given prefix.
+func nextLineHasPrefix(reader *bufio.Reader, prefix []byte) (bool, error) {
+	next, err := reader.Peek(len(prefix))
+	if err != nil {
+		return false, err
+	}
+	return bytes.HasPrefix(next, prefix), nil
+}
+
 // normalizeHeader takes a header of the form:
 // "@@ -linestart[,chunksize] +linestart[,chunksize] @@ section"
 // and returns two strings, with the first in the form:

diff/testdata/sample_hunk_lines_start_with_minuses.diff

@@ -0,0 +1,5 @@
+@@ -1,4 +1,3 @@
+ select 1;
+--- this is my query
+ select 2;
+ select 3;