Fix some problems with negative and out-of-range integers.

[chaz/tar] / src / compare.c

diff --git a/src/compare.c b/src/compare.c
index 7df3d9853d9dc7ed4b0f15308213e84c8e26ab42..0e99a7201cadf528bf57f1dc866c68c35091146c 100644 (file)
--- a/src/compare.c
+++ b/src/compare.c
@@ -1,13 +1,14 @@
 /* Diff files from a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
 /* Diff files from a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,

-   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2006, 2007, 2009, 2010, 2012 Free Software
+   Foundation, Inc.

 
    Written by John Gilmore, on 1987-04-30.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    Written by John Gilmore, on 1987-04-30.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -66,8 +67,7 @@ report_difference (struct tar_stat_info *st, const char *fmt, ...)
       fprintf (stdlis, "\n");
     }
 
       fprintf (stdlis, "\n");
     }
 

-  if (exit_status == TAREXIT_SUCCESS)
-    exit_status = TAREXIT_DIFFERS;
+  set_exit_status (TAREXIT_DIFFERS);

 }
 
 /* Take a buffer returned by read_and_process and do nothing with it.  */
 }
 
 /* Take a buffer returned by read_and_process and do nothing with it.  */


@@ -81,7 +81,7 @@ process_noop (size_t size __attribute__ ((unused)),
 static int
 process_rawdata (size_t bytes, char *buffer)
 {
 static int
 process_rawdata (size_t bytes, char *buffer)
 {

-  size_t status = safe_read (diff_handle, diff_buffer, bytes);
+  size_t status = blocking_read (diff_handle, diff_buffer, bytes);

 
   if (status != bytes)
     {
 
   if (status != bytes)
     {


@@ -123,7 +123,7 @@ read_and_process (struct tar_stat_info *st, int (*processor) (size_t, char *))
   size_t data_size;
   off_t size = st->stat.st_size;
 
   size_t data_size;
   off_t size = st->stat.st_size;
 

-  mv_begin (st);
+  mv_begin_read (st);

   while (size)
     {
       data_block = find_next_block ();
   while (size)
     {
       data_block = find_next_block ();


@@ -152,7 +152,7 @@ read_and_process (struct tar_stat_info *st, int (*processor) (size_t, char *))
 static int
 get_stat_data (char const *file_name, struct stat *stat_data)
 {
 static int
 get_stat_data (char const *file_name, struct stat *stat_data)
 {

-  int status = deref_stat (dereference_option, file_name, stat_data);
+  int status = deref_stat (file_name, stat_data);

 
   if (status != 0)
     {
 
   if (status != 0)
     {


@@ -218,12 +218,7 @@ diff_file (void)
        }
       else
        {
        }
       else
        {

-         int atime_flag =
-           (atime_preserve_option == system_atime_preserve
-            ? O_NOATIME
-            : 0);
-
-         diff_handle = open (file_name, O_RDONLY | O_BINARY | atime_flag);
+         diff_handle = openat (chdir_fd, file_name, open_read_flags);

 
          if (diff_handle < 0)
            {
 
          if (diff_handle < 0)
            {


@@ -240,12 +235,12 @@ diff_file (void)
              else
                read_and_process (&current_stat_info, process_rawdata);
 
              else
                read_and_process (&current_stat_info, process_rawdata);
 

-             if (atime_preserve_option == replace_atime_preserve)
+             if (atime_preserve_option == replace_atime_preserve
+                 && stat_data.st_size != 0)

                {
                {

-                 struct timespec ts[2];
-                 ts[0] = get_stat_atime (&stat_data);
-                 ts[1] = get_stat_mtime (&stat_data);
-                 if (set_file_atime (diff_handle, file_name, ts) != 0)
+                 struct timespec atime = get_stat_atime (&stat_data);
+                 if (set_file_atime (diff_handle, chdir_fd, file_name, atime)
+                     != 0)

                    utime_error (file_name);
                }
 
                    utime_error (file_name);
                }
 


@@ -278,7 +273,8 @@ diff_symlink (void)
   size_t len = strlen (current_stat_info.link_name);
   char *linkbuf = alloca (len + 1);
 
   size_t len = strlen (current_stat_info.link_name);
   char *linkbuf = alloca (len + 1);
 

-  int status = readlink (current_stat_info.file_name, linkbuf, len + 1);
+  int status = readlinkat (chdir_fd, current_stat_info.file_name,
+                          linkbuf, len + 1);

 
   if (status < 0)
     {
 
   if (status < 0)
     {


@@ -332,7 +328,7 @@ static int
 dumpdir_cmp (const char *a, const char *b)
 {
   size_t len;
 dumpdir_cmp (const char *a, const char *b)
 {
   size_t len;

-  
+

   while (*a)
     switch (*a)
       {
   while (*a)
     switch (*a)
       {


@@ -346,7 +342,7 @@ dumpdir_cmp (const char *a, const char *b)
        a += len;
        b += len;
        break;
        a += len;
        b += len;
        break;

-       
+

       case 'D':
        if (strcmp(a, b))
          return 1;
       case 'D':
        if (strcmp(a, b))
          return 1;


@@ -354,7 +350,7 @@ dumpdir_cmp (const char *a, const char *b)
        a += len;
        b += len;
        break;
        a += len;
        b += len;
        break;

-       
+

       case 'R':
       case 'T':
       case 'X':
       case 'R':
       case 'T':
       case 'X':


@@ -364,31 +360,35 @@ dumpdir_cmp (const char *a, const char *b)
 }
 
 static void
 }
 
 static void

-diff_dumpdir (void)
+diff_dumpdir (struct tar_stat_info *dir)

 {
 {

-  char *dumpdir_buffer;
-  dev_t dev = 0;
-  struct stat stat;
+  const char *dumpdir_buffer;

 
 

-  if (deref_stat (true, current_stat_info.file_name, &stat))
+  if (dir->fd == 0)

     {
     {

-      if (errno == ENOENT)
-       stat_warn (current_stat_info.file_name);
+      void (*diag) (char const *) = NULL;
+      int fd = subfile_open (dir->parent, dir->orig_file_name, open_read_flags);
+      if (fd < 0)
+       diag = open_diag;
+      else if (fstat (fd, &dir->stat))
+       diag = stat_diag;

       else
       else

-       stat_error (current_stat_info.file_name);
+       dir->fd = fd;
+      if (diag)
+       {
+         file_removed_diag (dir->orig_file_name, false, diag);
+         return;
+       }

     }
     }

-  else
-    dev = stat.st_dev;
-
-  dumpdir_buffer = get_directory_contents (current_stat_info.file_name, dev);
+  dumpdir_buffer = directory_contents (scan_directory (dir));

 
   if (dumpdir_buffer)
     {
 
   if (dumpdir_buffer)
     {

-      if (dumpdir_cmp (current_stat_info.dumpdir, dumpdir_buffer))
-       report_difference (&current_stat_info, _("Contents differ"));
+      if (dumpdir_cmp (dir->dumpdir, dumpdir_buffer))
+       report_difference (dir, _("Contents differ"));

     }
   else
     }
   else

-    read_and_process (&current_stat_info, process_noop);
+    read_and_process (dir, process_noop);

 }
 
 static void
 }
 
 static void


@@ -415,14 +415,17 @@ diff_multivol (void)
     }
 
   offset = OFF_FROM_HEADER (current_header->oldgnu_header.offset);
     }
 
   offset = OFF_FROM_HEADER (current_header->oldgnu_header.offset);

-  if (stat_data.st_size != current_stat_info.stat.st_size + offset)
+  if (offset < 0
+      || INT_ADD_OVERFLOW (current_stat_info.stat.st_size, offset)
+      || stat_data.st_size != current_stat_info.stat.st_size + offset)

     {
       report_difference (&current_stat_info, _("Size differs"));
       skip_member ();
       return;
     }
 
     {
       report_difference (&current_stat_info, _("Size differs"));
       skip_member ();
       return;
     }
 

-  fd = open (current_stat_info.file_name, O_RDONLY | O_BINARY);
+
+  fd = openat (chdir_fd, current_stat_info.file_name, open_read_flags);

 
   if (fd < 0)
     {
 
   if (fd < 0)
     {


@@ -452,7 +455,6 @@ diff_archive (void)
 {
 
   set_next_block_after (current_header);
 {
 
   set_next_block_after (current_header);

-  decode_header (current_header, &current_stat_info, &current_format, 1);

 
   /* Print the block from current_header and current_stat_info.  */
 
 
   /* Print the block from current_header and current_stat_info.  */
 


@@ -460,13 +462,13 @@ diff_archive (void)
     {
       if (now_verifying)
        fprintf (stdlis, _("Verify "));
     {
       if (now_verifying)
        fprintf (stdlis, _("Verify "));

-      print_header (&current_stat_info, -1);
+      print_header (&current_stat_info, current_header, -1);

     }
 
   switch (current_header->header.typeflag)
     {
     default:
     }
 
   switch (current_header->header.typeflag)
     {
     default:

-      ERROR ((0, 0, _("%s: Unknown file type `%c', diffed as normal file"),
+      ERROR ((0, 0, _("%s: Unknown file type '%c', diffed as normal file"),

              quotearg_colon (current_stat_info.file_name),
              current_header->header.typeflag));
       /* Fall through.  */
              quotearg_colon (current_stat_info.file_name),
              current_header->header.typeflag));
       /* Fall through.  */


@@ -503,7 +505,7 @@ diff_archive (void)
     case GNUTYPE_DUMPDIR:
     case DIRTYPE:
       if (is_dumpdir (&current_stat_info))
     case GNUTYPE_DUMPDIR:
     case DIRTYPE:
       if (is_dumpdir (&current_stat_info))

-       diff_dumpdir ();
+       diff_dumpdir (&current_stat_info);

       diff_dir ();
       break;
 
       diff_dir ();
       break;
 


@@ -518,13 +520,24 @@ diff_archive (void)
 void
 verify_volume (void)
 {
 void
 verify_volume (void)
 {

+  int may_fail = 0;

   if (removed_prefixes_p ())
     {
       WARN((0, 0,
            _("Archive contains file names with leading prefixes removed.")));
   if (removed_prefixes_p ())
     {
       WARN((0, 0,
            _("Archive contains file names with leading prefixes removed.")));

+      may_fail = 1;
+    }
+  if (transform_program_p ())
+    {

       WARN((0, 0,
       WARN((0, 0,

-           _("Verification may fail to locate original files.")));
+           _("Archive contains transformed file names.")));
+      may_fail = 1;

     }
     }

+  if (may_fail)
+    WARN((0, 0,
+         _("Verification may fail to locate original files.")));
+
+  clear_directory_table ();

 
   if (!diff_buffer)
     diff_init ();
 
   if (!diff_buffer)
     diff_init ();


@@ -578,7 +591,9 @@ verify_volume (void)
   flush_read ();
   while (1)
     {
   flush_read ();
   while (1)
     {

-      enum read_header status = read_header (false);
+      enum read_header status = read_header (&current_header,
+                                             &current_stat_info,
+                                             read_header_auto);

 
       if (status == HEADER_FAILURE)
        {
 
       if (status == HEADER_FAILURE)
        {


@@ -588,7 +603,8 @@ verify_volume (void)
            {
              counter++;
              set_next_block_after (current_header);
            {
              counter++;
              set_next_block_after (current_header);

-             status = read_header (false);
+             status = read_header (&current_header, &current_stat_info,
+                                   read_header_auto);

            }
          while (status == HEADER_FAILURE);
 
            }
          while (status == HEADER_FAILURE);
 


@@ -597,9 +613,27 @@ verify_volume (void)
                            "VERIFY FAILURE: %d invalid headers detected",
                            counter), counter));
        }
                            "VERIFY FAILURE: %d invalid headers detected",
                            counter), counter));
        }

-      if (status == HEADER_ZERO_BLOCK || status == HEADER_END_OF_FILE)
+      if (status == HEADER_END_OF_FILE)

        break;
        break;

+      if (status == HEADER_ZERO_BLOCK)
+       {
+         set_next_block_after (current_header);
+          if (!ignore_zeros_option)
+            {
+             char buf[UINTMAX_STRSIZE_BOUND];
+
+             status = read_header (&current_header, &current_stat_info,
+                                   read_header_auto);
+             if (status == HEADER_ZERO_BLOCK)
+               break;
+             WARNOPT (WARN_ALONE_ZERO_BLOCK,
+                      (0, 0, _("A lone zero block at %s"),
+                       STRINGIFY_BIGINT (current_block_ordinal (), buf)));
+            }
+         continue;
+       }

 
 

+      decode_header (current_header, &current_stat_info, &current_format, 1);

       diff_archive ();
       tar_stat_destroy (&current_stat_info);
     }
       diff_archive ();
       tar_stat_destroy (&current_stat_info);
     }