2 files changed, 8 insertions, 14 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,
           (*blrup) = blru;
           return 0;
         }
-
-      if (blru->blkno != (xoff_t)-1 &&
-          blru->blkno != (xoff_t)(blkno - lru_size))
-        {
-          return XD3_TOOFARBACK;
-        }
     }
   else
     {
@@ -390,6 +384,13 @@ main_read_seek_source (xd3_stream *stream,
 
       sfile->seek_failed = 1;
 
+      if (option_verbose > 1)
+        {
+          XPR(NT "non-seekable source skipping %"Q"u bytes @ %"Q"u\n",
+              pos - sfile->source_position,
+              sfile->source_position);
+        }
+
       while (sfile->source_position < pos)
         {
           xoff_t skip_blkno;
@@ -410,13 +411,6 @@ main_read_seek_source (xd3_stream *stream,
 
           XD3_ASSERT (is_new);
 
-          if (option_verbose > 1)
-            {
-              XPR(NT "non-seekable source skipping %"Q"u bytes @ %"Q"u\n",
-                  pos - sfile->source_position,
-                  sfile->source_position);
-            }
-
           if ((ret = main_read_primary_input (sfile,
                                               (uint8_t*) blru->blk,
                                               source->blksize,
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 5b1efa9..a1cb90a 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -497,7 +497,7 @@ void main_buffree (void *ptr) {
 #if XD3_WIN32
   VirtualFree(ptr, 0, MEM_RELEASE);
 #else
-  main_free(ptr);
+  main_free1(NULL, ptr);
 #endif
 }