CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-08-27 03:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix a bug in upstream CreateDelta that could ignore trailing data if a matching hash is not found for it

Browse source
This commit is contained in:
Kovid Goyal 2023-07-03 17:47:33 +05:30
parent 82721ef053
commit 79fd0b19cf
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tools/rsync/api_test.go
View file

@ -54,17 +54,22 @@ func TestRsyncRoundtrip(t *testing.T) {
signature = append(signature, s)
return nil
})
delta_ops := make([]Operation, 0, 128)
p.rsync.CreateDelta(bytes.NewReader(src_data), signature, func(op Operation) error {
op.Data = slices.Clone(op.Data)
delta_ops = append(delta_ops, op)
return nil
})
outputbuf := bytes.Buffer{}
for _, op := range delta_ops {
p.rsync.ApplyDelta(&outputbuf, bytes.NewReader(src_data), op)
apply_delta := func(signature []BlockHash) []byte {
delta_ops := make([]Operation, 0, 1024)
p.rsync.CreateDelta(bytes.NewReader(src_data), signature, func(op Operation) error {
op.Data = slices.Clone(op.Data)
delta_ops = append(delta_ops, op)
return nil
})
outputbuf := bytes.Buffer{}
for _, op := range delta_ops {
p.rsync.ApplyDelta(&outputbuf, bytes.NewReader(src_data), op)
}
return outputbuf.Bytes()
}
test_equal(src_data, outputbuf.Bytes())
test_equal(src_data, apply_delta(nil))
test_equal(src_data, apply_delta(signature))
// Now try with serialization
p = NewPatcher(int64(len(src_data)))
@ -80,7 +85,7 @@ func TestRsyncRoundtrip(t *testing.T) {
if err := d.CreateDelta(bytes.NewReader(src_data), func(b []byte) error { _, err := deltabuf.Write(b); return err }); err != nil {
t.Fatal(err)
}
outputbuf = bytes.Buffer{}
outputbuf := bytes.Buffer{}
p.StartDelta(&outputbuf, bytes.NewReader(src_data))
b := make([]byte, 30*1024)
for {