summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3-merge.h
diff options
context:
space:
mode:
authorjosh.macdonald <jmacd@users.noreply.github.com>2008-08-16 15:12:07 +0000
committerjosh.macdonald <jmacd@users.noreply.github.com>2008-08-16 15:12:07 +0000
commitcfa558736324be5e2068f5459a55f882c2631bc6 (patch)
treed1677d1178c74630e3ad38e0fbbbcd54a467caf9 /xdelta3/xdelta3-merge.h
parentd490e1971a6155e2637afbae6f13f97eee49ff95 (diff)
Fix bug in xd3_merge_add(), calling memcpy with wrong offset and size.
Diffstat (limited to 'xdelta3/xdelta3-merge.h')
-rw-r--r--xdelta3/xdelta3-merge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index 6c03d3e..c537408 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -299,9 +299,9 @@ xd3_merge_add (xd3_stream *stream,
299 oinst->position = stream->whole_target.length; 299 oinst->position = stream->whole_target.length;
300 stream->whole_target.length += iinst->size; 300 stream->whole_target.length += iinst->size;
301 301
302 memcpy(stream->whole_target.adds, 302 memcpy(stream->whole_target.adds + stream->whole_target.addslen,
303 target->adds + iinst->addr, 303 target->adds + iinst->addr,
304 stream->whole_target.addslen); 304 iinst->size);
305 305
306 stream->whole_target.addslen += iinst->size; 306 stream->whole_target.addslen += iinst->size;
307 307