summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3-blkcache.h
diff options
context:
space:
mode:
authorjosh.macdonald <jmacd@users.noreply.github.com>2012-11-12 08:37:40 +0000
committerjosh.macdonald <jmacd@users.noreply.github.com>2012-11-12 08:37:40 +0000
commitcf7a6661699ee81be37b5866744440f2e4ebbd55 (patch)
treee3409e2c9c5f821b8a9790966dd5b83b10384de2 /xdelta3/xdelta3-blkcache.h
parent21f36c26398ef1907bc43e02f4a9c2b8da9872b0 (diff)
Remove a harmful error check/message, which prevented the decoder from reading correct inputs
Diffstat (limited to 'xdelta3/xdelta3-blkcache.h')
-rw-r--r--xdelta3/xdelta3-blkcache.h20
1 files changed, 7 insertions, 13 deletions
diff --git a/xdelta3/xdelta3-blkcache.h b/xdelta3/xdelta3-blkcache.h
index 36f8216..46a6a6e 100644
--- a/xdelta3/xdelta3-blkcache.h
+++ b/xdelta3/xdelta3-blkcache.h
@@ -289,12 +289,6 @@ main_getblk_lru (xd3_source *source, xoff_t blkno,
289 (*blrup) = blru; 289 (*blrup) = blru;
290 return 0; 290 return 0;
291 } 291 }
292
293 if (blru->blkno != (xoff_t)-1 &&
294 blru->blkno != (xoff_t)(blkno - lru_size))
295 {
296 return XD3_TOOFARBACK;
297 }
298 } 292 }
299 else 293 else
300 { 294 {
@@ -390,6 +384,13 @@ main_read_seek_source (xd3_stream *stream,
390 384
391 sfile->seek_failed = 1; 385 sfile->seek_failed = 1;
392 386
387 if (option_verbose > 1)
388 {
389 XPR(NT "non-seekable source skipping %"Q"u bytes @ %"Q"u\n",
390 pos - sfile->source_position,
391 sfile->source_position);
392 }
393
393 while (sfile->source_position < pos) 394 while (sfile->source_position < pos)
394 { 395 {
395 xoff_t skip_blkno; 396 xoff_t skip_blkno;
@@ -410,13 +411,6 @@ main_read_seek_source (xd3_stream *stream,
410 411
411 XD3_ASSERT (is_new); 412 XD3_ASSERT (is_new);
412 413
413 if (option_verbose > 1)
414 {
415 XPR(NT "non-seekable source skipping %"Q"u bytes @ %"Q"u\n",
416 pos - sfile->source_position,
417 sfile->source_position);
418 }
419
420 if ((ret = main_read_primary_input (sfile, 414 if ((ret = main_read_primary_input (sfile,
421 (uint8_t*) blru->blk, 415 (uint8_t*) blru->blk,
422 source->blksize, 416 source->blksize,