Skip to content

Commit fc6253d

Browse files
committed
removed some extra checks in apply-delta which are indeed not required
1 parent e9c5cf3 commit fc6253d

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

fun.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,16 +155,14 @@ def stream_copy(read, write, size, chunk_size):
155155
return dbw
156156

157157

158-
def apply_delta_data(src_buf, src_buf_size, delta_buf, delta_buf_size, target_file,
159-
target_size):
158+
def apply_delta_data(src_buf, src_buf_size, delta_buf, delta_buf_size, target_file):
160159
"""Apply data from a delta buffer using a source buffer to the target file,
161160
which will be written to
162161
:param src_buf: random access data from which the delta was created
163162
:param src_buf_size: size of the source buffer in bytes
164163
:param delta_buf_size: size fo the delta buffer in bytes
165164
:param delta_buf: random access delta data
166165
:param target_file: file like object to write the result to
167-
:param target_size: size of the target buffer
168166
:note: transcribed to python from the similar routine in patch-delta.c"""
169167
i = 0
170168
twrite = target_file.write
@@ -201,17 +199,12 @@ def apply_delta_data(src_buf, src_buf_size, delta_buf, delta_buf_size, target_fi
201199

202200
rbound = cp_off + cp_size
203201
if (rbound < cp_size or
204-
rbound > src_buf_size or
205-
cp_size > target_size):
202+
rbound > src_buf_size):
206203
break
207204
twrite(buffer(src_buf, cp_off, cp_size))
208-
target_size -= cp_size
209205
elif c:
210-
if c > target_size:
211-
break
212206
twrite(db[i:i+c])
213207
i += c
214-
target_size -= c
215208
else:
216209
raise ValueError("unexpected delta opcode 0")
217210
# END handle command byte

stream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ def _set_cache_(self, attr):
379379
stream_copy(dstream.read, ddata.write, dstream.size, 256*mmap.PAGESIZE)
380380

381381
#######################################################################
382-
apply_delta_data(bbuf, src_size, ddata, len(ddata), tbuf, target_size)
382+
apply_delta_data(bbuf, src_size, ddata, len(ddata), tbuf)
383383
#######################################################################
384384

385385
# finally, swap out source and target buffers. The target is now the

0 commit comments

Comments
 (0)