better error handling

aiq · Feb 16, 2022 · d666755 · d666755
1 parent 539edb3
commit d666755
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Reader.go b/Reader.go
@@ -46,7 +46,13 @@ func readString(r *bufio.Reader, delim []byte) (string, error) {
 		if bytes.Equal(buf, delimTail) {
 			search = false
 			_, err = r.Read(buf)
-			builder.Write(buf)
+			if err != nil {
+				return builder.String(), err
+			}
+			_, err = builder.Write(buf)
+			if err != nil {
+				return builder.String(), err
+			}
 		}
 	}
 	return builder.String(), nil
@@ -115,7 +121,7 @@ func (my *Reader) readHeader() (Header, error) {
 func (my *Reader) readContent() (string, error) {
 	delim := "//"
 	if my.expPatt != "" {
-		delim = "//-" + my.expPatt + "-"
+		delim = "//" + my.expPatt
 	}
 
 	cnt, err := readString(my.Reader, []byte(delim))