1 files changed, 5 insertions, 3 deletions

diff --git a/archival/tar.c b/archival/tar.c
index 54989b953..3375d1fe9 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -161,7 +161,7 @@ typedef struct TarBallInfo {
 # endif
         HardLinkInfo *hlInfoHead;       /* Hard Link Tracking Information */
         HardLinkInfo *hlInfo;           /* Hard Link Info for the current file */
-#if !ENABLE_PLATFORM_MINGW32 || ENABLE_FEATURE_EXTRA_FILE_DATA
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA
 //TODO: save only st_dev + st_ino
         struct stat tarFileStatBuf;     /* Stat info for the tarball, letting
                                          * us know the inode and device that the
@@ -529,12 +529,14 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
                 }
         }
 
-#if !ENABLE_PLATFORM_MINGW32 || ENABLE_FEATURE_EXTRA_FILE_DATA
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA
         /* It is a bad idea to store the archive we are in the process of creating,
          * so check the device and inode to be sure that this particular file isn't
          * the new tarball */
         if (tbInfo->tarFileStatBuf.st_dev == statbuf->st_dev
          && tbInfo->tarFileStatBuf.st_ino == statbuf->st_ino
+         /* ignore invalid inode numbers */
+         && (ENABLE_FEATURE_EXTRA_FILE_DATA && statbuf->st_ino != 0)
         ) {
                 bb_error_msg("%s: file is the archive; skipping", fileName);
                 return TRUE;
@@ -707,7 +709,7 @@ static NOINLINE int writeTarFile(
 
         /*tbInfo->hlInfoHead = NULL; - already is */
 
-#if !ENABLE_PLATFORM_MINGW32 || ENABLE_FEATURE_EXTRA_FILE_DATA
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA
         /* Store the stat info for the tarball's file, so
          * can avoid including the tarball into itself....  */
         xfstat(tbInfo->tarFd, &tbInfo->tarFileStatBuf, "can't stat tar file");