PR27861, Infinite loop in dwarf.c:7507-7526

[binutils-gdb.git] / binutils / arsup.c

diff --git a/binutils/arsup.c b/binutils/arsup.c
index 8b4437ff41741f670d453a401f4ce7c0356eb3f9..1d4d1ac70b039e6a3e3803ad5e23a04f6b0f1747 100644 (file)
--- a/binutils/arsup.c
+++ b/binutils/arsup.c
@@ -1,5 +1,5 @@
 /* arsup.c - Archive support for MRI compatibility
-   Copyright (C) 1992-2020 Free Software Foundation, Inc.
+   Copyright (C) 1992-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -42,6 +42,8 @@ extern int deterministic;
 
 static bfd *obfd;
 static char *real_name;
+static char *temp_name;
+static int temp_fd;
 static FILE *outfile;
 
 static void
@@ -72,7 +74,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
         want to hack multiple references.  */
       for (ptr = list; ptr; ptr = ptr->next)
        {
-         bfd_boolean found = FALSE;
+         bool found = false;
          bfd *prev = arch;
 
          for (head = arch->archive_next; head; head = head->archive_next)
@@ -80,7 +82,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
              if (bfd_get_filename (head) != NULL
                  && FILENAME_CMP (ptr->name, bfd_get_filename (head)) == 0)
                {
-                 found = TRUE;
+                 found = true;
                  function (head, prev);
                }
              prev = head;
@@ -96,7 +98,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
 static void
 ar_directory_doer (bfd *abfd, bfd *ignore ATTRIBUTE_UNUSED)
 {
-  print_arelt_descr(outfile, abfd, verbose, FALSE);
+  print_arelt_descr(outfile, abfd, verbose, false);
 }
 
 void
@@ -149,27 +151,24 @@ maybequit (void)
 void
 ar_open (char *name, int t)
 {
-  char *tname;
-  const char *bname = lbasename (name);
-  real_name = name;
+  real_name = xstrdup (name);
+  temp_name = make_tempname (real_name, &temp_fd);
 
-  /* Prepend tmp- to the beginning, to avoid file-name clashes after
-     truncation on filesystems with limited namespaces (DOS).  */
-  if (asprintf (&tname, "%.*stmp-%s", (int) (bname - name), name, bname) == -1)
+  if (temp_name == NULL)
     {
-      fprintf (stderr, _("%s: Can't allocate memory for temp name (%s)\n"),
+      fprintf (stderr, _("%s: Can't open temporary file (%s)\n"),
               program_name, strerror(errno));
       maybequit ();
       return;
     }
 
-  obfd = bfd_openw (tname, NULL);
+  obfd = bfd_fdopenw (temp_name, NULL, temp_fd);
 
   if (!obfd)
     {
       fprintf (stderr,
               _("%s: Can't open output archive %s\n"),
-              program_name,  tname);
+              program_name, temp_name);
 
       maybequit ();
     }
@@ -181,7 +180,11 @@ ar_open (char *name, int t)
          bfd *element;
          bfd *ibfd;
 
+#if BFD_SUPPORTS_PLUGINS         
+         ibfd = bfd_openr (name, "plugin");
+#else
          ibfd = bfd_openr (name, NULL);
+#endif
 
          if (!ibfd)
            {
@@ -344,28 +347,31 @@ ar_save (void)
     }
   else
     {
-      char *ofilename = xstrdup (bfd_get_filename (obfd));
-      bfd_boolean skip_stat = FALSE;
       struct stat target_stat;
-      int ofd = -1;
 
       if (deterministic > 0)
         obfd->flags |= BFD_DETERMINISTIC_OUTPUT;
 
-#if !defined (_WIN32) || defined (__CYGWIN32__)
-      /* It's OK to fail; at worst it will result in SMART_RENAME using a slow
-         copy fallback to write the output.  */
-      ofd = dup (fileno (obfd->iostream));
-      if (lstat (real_name, &target_stat) != 0)
-       skip_stat = TRUE;
-#endif
-
+      temp_fd = dup (temp_fd);
       bfd_close (obfd);
 
-      smart_rename (ofilename, real_name, ofd,
-                   skip_stat ? NULL : &target_stat, 0);
+      if (stat (real_name, &target_stat) != 0)
+       {
+         /* The temp file created in ar_open has mode 0600 as per mkstemp.
+            Create the real empty output file here so smart_rename will
+            update the mode according to the process umask.  */
+         obfd = bfd_openw (real_name, NULL);
+         if (obfd != NULL)
+           {
+             bfd_set_format (obfd, bfd_archive);
+             bfd_close (obfd);
+           }
+       }
+
+      smart_rename (temp_name, real_name, temp_fd, NULL, false);
       obfd = 0;
-      free (ofilename);
+      free (temp_name);
+      free (real_name);
     }
 }