mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-25 17:27:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #819 from enkore/fix/chunker-io2

Browse source 
Chunker: fix wrong EOF assumption, check for return type
This commit is contained in:
TW 2016-03-31 23:45:47 +02:00
commit ad57178ad7
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
borg/_chunker.c
View file

@ -174,6 +174,10 @@ chunker_fill(Chunker *c)
return 0; return 0;
} }
n = PyBytes_Size(data); n = PyBytes_Size(data);
if(PyErr_Occurred()) {
// we wanted bytes(), but got something else
return 0;
}
if(n) { if(n) {
memcpy(c->data + c->position + c->remaining, PyBytes_AsString(data), n); memcpy(c->data + c->position + c->remaining, PyBytes_AsString(data), n);
c->remaining += n; c->remaining += n;
@ -200,12 +204,12 @@ chunker_process(Chunker *c)
PyErr_SetString(PyExc_Exception, "chunkifier byte count mismatch"); PyErr_SetString(PyExc_Exception, "chunkifier byte count mismatch");
return NULL; return NULL;
} }
if(c->remaining <= window_size) { while(c->remaining <= window_size && !c->eof) {
if(!chunker_fill(c)) { if(!chunker_fill(c)) {
return NULL; return NULL;
} }
} }
if(c->remaining < window_size) { if(c->eof) {
c->done = 1; c->done = 1;
if(c->remaining) { if(c->remaining) {
c->bytes_yielded += c->remaining; c->bytes_yielded += c->remaining;

13
borg/testsuite/chunker.py
View file

@ -1,7 +1,7 @@
from io import BytesIO from io import BytesIO
from ..chunker import Chunker, buzhash, buzhash_update from ..chunker import Chunker, buzhash, buzhash_update
from ..archive import CHUNK_MAX_EXP from ..archive import CHUNK_MAX_EXP, CHUNKER_PARAMS
from . import BaseTestCase from . import BaseTestCase
@ -29,3 +29,14 @@ def test_buzhash(self):
self.assert_equal(buzhash(b'abcdefghijklmnop', 1), buzhash_update(buzhash(b'Xabcdefghijklmno', 1), ord('X'), ord('p'), 16, 1)) self.assert_equal(buzhash(b'abcdefghijklmnop', 1), buzhash_update(buzhash(b'Xabcdefghijklmno', 1), ord('X'), ord('p'), 16, 1))
# Test with more than 31 bytes to make sure our barrel_shift macro works correctly # Test with more than 31 bytes to make sure our barrel_shift macro works correctly
self.assert_equal(buzhash(b'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz', 0), 566521248) self.assert_equal(buzhash(b'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz', 0), 566521248)
def test_small_reads(self):
class SmallReadFile:
input = b'a' * (20 + 1)
def read(self, nbytes):
self.input = self.input[:-1]
return self.input[:1]
reconstructed = b''.join(Chunker(0, *CHUNKER_PARAMS).chunkify(SmallReadFile()))
assert reconstructed == b'a' * 20