If seek fails, fail the xar read. We should be able to do better than this.

diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index 780e749d7096ed28d5358bb34936d914a11eb599..6a9e1923be6937d99c3f45b27a1c5f833cd4d550 100644 (file)
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -967,10 +967,14 @@ move_reading_point(struct archive_read *a, uint64_t offset)
                                return ((int)step);
                        xar->offset += step;
                } else {
-                       archive_set_error(&(a->archive),
-                           ARCHIVE_ERRNO_MISC,
-                           "Cannot seek.");
-                       return (ARCHIVE_FAILED);
+                       int64_t pos = __archive_read_seek(a, offset, SEEK_SET);
+                       if (pos == ARCHIVE_FAILED) {
+                               archive_set_error(&(a->archive),
+                                   ARCHIVE_ERRNO_MISC,
+                                   "Cannot seek.");
+                               return (ARCHIVE_FAILED);
+                       }
+                       xar->offset = pos;
                }
        }
        return (ARCHIVE_OK);