Merge branch 'hotfix/1.0.5'

gabstv · Mar 21, 2019 · d449682 · d449682
2 parents ebb2b86 + d20f7de
commit d449682
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/bspatch/bspatch.go b/pkg/bspatch/bspatch.go
@@ -156,13 +156,13 @@ func patchb(oldfile, patch []byte) ([]byte, error) {
 	for newpos < newsize {
 		// Read control data
 		for i = 0; i <= 2; i++ {
-			lenread, err = cpfbz2.Read(buf)
+			lenread, err = zreadall(cpfbz2, buf, 8)
 			if lenread != 8 || (err != nil && err != io.EOF) {
 				e0 := ""
 				if err != nil {
 					e0 = err.Error()
 				}
-				return nil, fmt.Errorf("corrupt patch or bzstream ended: %s", e0)
+				return nil, fmt.Errorf("corrupt patch or bzstream ended: %s (read: %v/8)", e0, lenread)
 			}
 			ctrl[i] = offtin(buf)
 		}

diff --git a/pkg/bspatch/bspatch_test.go b/pkg/bspatch/bspatch_test.go
@@ -50,6 +50,11 @@ func TestPatch(t *testing.T) {
 	if !bytes.Equal(newfile, newfilecomp) {
 		t.Fatal("expected:", newfilecomp, "got:", newfile)
 	}
+	// test invalid patch
+	_, err = Bytes(oldfile, oldfile)
+	if err == nil {
+		t.Fail()
+	}
 }
 
 func TestOfftin(t *testing.T) {