1 files changed, 4 insertions, 1 deletions

diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index 54c8f7665..b1a797a08 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -112,7 +112,7 @@ char get_header_tar(archive_handle_t *archive_handle)
         archive_handle->offset += 512;
 
         /* If there is no filename its an empty header */
-        if (tar.name[0] == 0) {
+        if (tar.name[0] == 0 && tar.prefix[0] == 0) {
                 if (end) {
                         /* This is the second consecutive empty header! End of archive!
                          * Read until the end to empty the pipe from gz or bz2
@@ -211,9 +211,12 @@ char get_header_tar(archive_handle_t *archive_handle)
         /* getOctal trashes subsequent field, therefore we call it
          * on fields in reverse order */
         if (tar.devmajor[0]) {
+                char t = tar.prefix[0];
+                /* we trash prefix[0] here, but we DO need it later! */
                 unsigned minor = GET_OCTAL(tar.devminor);
                 unsigned major = GET_OCTAL(tar.devmajor);
                 file_header->device = makedev(major, minor);
+                tar.prefix[0] = t;
         }
         file_header->link_target = NULL;
         if (!linkname && parse_names && tar.linkname[0]) {