WebSVN – Kolibri OS – Diff – /contrib/toolchain/binutils/bfd/archive.c

 /* BFD back-end for archive files (libraries).
-   Copyright 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2015 Free Software Foundation, Inc.
    Written by Cygnus Support.  Mostly Gumby Henkel-Wallace's fault.
    This file is part of BFD, the Binary File Descriptor library.
 #include "aout/ar.h"
 #include "aout/ranlib.h"
 #include "safe-ctype.h"
 #include "hashtab.h"
 #include "filenames.h"
+#include "bfdlink.h"
 #ifndef errno
 extern int errno;
   if (hash_table)
+    {
       struct ar_cache *entry = (struct ar_cache *) htab_find (hash_table, &m);
       if (!entry)
 	return NULL;
+      /* Unfortunately this flag is set after checking that we have
+	 an archive, and checking for an archive means one element has
-      else
+	 sneaked into the cache.  */
+      entry->arbfd->no_export = arch_bfd->no_export;
 	return entry->arbfd;
+    }
   else
     return NULL;
+}
   return TRUE;
+}
 static bfd *
-_bfd_find_nested_archive (bfd *arch_bfd, const char *filename)
+open_nested_file (const char *filename, bfd *archive)
-{
   bfd *abfd;
+  const char *target;
+  bfd *n_bfd;
+  target = NULL;
+  if (!archive->target_defaulted)
+    target = archive->xvec->name;
+  n_bfd = bfd_openr (filename, target);
+  if (n_bfd != NULL)
+    {
+      n_bfd->lto_output = archive->lto_output;
+      n_bfd->no_export = archive->no_export;
+    }
+  return n_bfd;
+}
+static bfd *
+find_nested_archive (const char *filename, bfd *arch_bfd)
+{
-  const char *target;
+  bfd *abfd;
   /* PR 15140: Don't allow a nested archive pointing to itself.  */
   if (filename_cmp (filename, arch_bfd->filename) == 0)
        abfd = abfd->archive_next)
+    {
       if (filename_cmp (filename, abfd->filename) == 0)
 	return abfd;
+    }
-  target = NULL;
-  if (!arch_bfd->target_defaulted)
-    target = arch_bfd->xvec->name;
-  abfd = bfd_openr (filename, target);
+  abfd = open_nested_file (filename, arch_bfd);
   if (abfd)
+    {
       abfd->archive_next = arch_bfd->nested_archives;
       arch_bfd->nested_archives = abfd;
+    }
 bfd *
 _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos)
+{
   struct areltdata *new_areldata;
-  bfd *n_nfd;
+  bfd *n_bfd;
   char *filename;
-  n_nfd = _bfd_look_for_bfd_in_cache (archive, filepos);
+  n_bfd = _bfd_look_for_bfd_in_cache (archive, filepos);
-  if (n_nfd)
+  if (n_bfd)
-    return n_nfd;
+    return n_bfd;
   filename = new_areldata->filename;
-  if (bfd_is_thin_archive (archive))
-    {
-      const char *target;
+  if (bfd_is_thin_archive (archive))
+    {
       /* This is a proxy entry for an external file.  */
       if (! IS_ABSOLUTE_PATH (filename))
+	{
       if (new_areldata->origin > 0)
+	{
 	  /* This proxy entry refers to an element of a nested archive.
 	     Locate the member of that archive and return a bfd for it.  */
-	  bfd *ext_arch = _bfd_find_nested_archive (archive, filename);
+	  bfd *ext_arch = find_nested_archive (filename, archive);
 	  if (ext_arch == NULL
 	      || ! bfd_check_format (ext_arch, bfd_archive))
+	    {
 	      free (new_areldata);
 	      return NULL;
 	    }
-	  n_nfd = _bfd_get_elt_at_filepos (ext_arch, new_areldata->origin);
+	  n_bfd = _bfd_get_elt_at_filepos (ext_arch, new_areldata->origin);
-	  if (n_nfd == NULL)
+	  if (n_bfd == NULL)
+	    {
 	      free (new_areldata);
 	      return NULL;
 	    }
-	  n_nfd->proxy_origin = bfd_tell (archive);
+	  n_bfd->proxy_origin = bfd_tell (archive);
+	  return n_bfd;
 	  return n_nfd;
-      /* It's not an element of a nested archive;
-	 open the external file as a bfd.  */
-      target = NULL;
-      if (!archive->target_defaulted)
+      /* It's not an element of a nested archive;
-	target = archive->xvec->name;
+	 open the external file as a bfd.  */
-      n_nfd = bfd_openr (filename, target);
+      n_bfd = open_nested_file (filename, archive);
-      if (n_nfd == NULL)
+      if (n_bfd == NULL)
 	bfd_set_error (bfd_error_malformed_archive);
+    }
   else
+    {
-      n_nfd = _bfd_create_empty_archive_element_shell (archive);
+      n_bfd = _bfd_create_empty_archive_element_shell (archive);
+    }
-  if (n_nfd == NULL)
+  if (n_bfd == NULL)
+    {
       free (new_areldata);
       return NULL;
+    }
-  n_nfd->proxy_origin = bfd_tell (archive);
+  n_bfd->proxy_origin = bfd_tell (archive);
   if (bfd_is_thin_archive (archive))
     {
-      n_nfd->origin = 0;
+      n_bfd->origin = 0;
+    }
   else
     {
-      n_nfd->origin = n_nfd->proxy_origin;
+      n_bfd->origin = n_bfd->proxy_origin;
+      n_bfd->filename = xstrdup (filename);
+    }
+  n_bfd->arelt_data = new_areldata;
-      n_nfd->filename = filename;
+  /* Copy BFD_COMPRESS, BFD_DECOMPRESS and BFD_COMPRESS_GABI flags.  */
-    }
+  n_bfd->flags |= archive->flags & (BFD_COMPRESS
 				    | BFD_DECOMPRESS
-  n_nfd->arelt_data = new_areldata;
+				    | BFD_COMPRESS_GABI);
-  /* Copy BFD_COMPRESS and BFD_DECOMPRESS flags.  */
+  /* Copy is_linker_input.  */
-  n_nfd->flags |= archive->flags & (BFD_COMPRESS | BFD_DECOMPRESS);
+  n_bfd->is_linker_input = archive->is_linker_input;
+}
 bfd *
 bfd_generic_openr_next_archived_file (bfd *archive, bfd *last_file)
 {
-  file_ptr filestart;
+  ufile_ptr filestart;
   if (!last_file)
     filestart = bfd_ardata (archive)->first_file_filepos;
-  else
-    {
-      bfd_size_type size = arelt_size (last_file);
+  else
+    {
+      filestart = last_file->proxy_origin;
+      if (! bfd_is_thin_archive (archive))
+	{
-      filestart = last_file->proxy_origin;
+      bfd_size_type size = arelt_size (last_file);
       if (! bfd_is_thin_archive (archive))
 	filestart += size;
       /* Pad to an even boundary...
 	 Note that last_file->origin can be odd in the case of
+	 BSD-4.4-style element with a long odd size.  */
+      filestart += filestart % 2;
+	  if (filestart <= last_file->proxy_origin)
+	    {
+	      /* Prevent looping.  See PR19256.  */
+	      bfd_set_error (bfd_error_malformed_archive);
+	      return NULL;
 	 BSD-4.4-style element with a long odd size.  */
       filestart += filestart % 2;
+    }
   mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
   if (mapdata == NULL)
     return FALSE;
   parsed_size = mapdata->parsed_size;
   free (mapdata);
+  /* PR 17512: file: 883ff754.  */
+  /* PR 17512: file: 0458885f.  */
+  if (parsed_size < 4)
+    return FALSE;
   raw_armap = (bfd_byte *) bfd_zalloc (abfd, parsed_size);
   if (raw_armap == NULL)
       bfd_release (abfd, raw_armap);
       return FALSE;
+    }
-  ardata->symdef_count = H_GET_32 (abfd, raw_armap) / BSD_SYMDEF_SIZE;
   ardata->symdef_count = H_GET_32 (abfd, raw_armap) / BSD_SYMDEF_SIZE;
   if (ardata->symdef_count * BSD_SYMDEF_SIZE >
       parsed_size - BSD_SYMDEF_COUNT_SIZE)
+    {
       /* Probably we're using the wrong byte ordering.  */
 	bfd_set_error (bfd_error_malformed_archive);
       goto release_raw_armap;
+    }
   /* OK, build the carsyms.  */
-  for (i = 0; i < nsymz; i++)
+  for (i = 0; i < nsymz && stringsize > 0; i++)
+    {
+      bfd_size_type len;
       rawptr = raw_armap + i;
       carsyms->file_offset = swap ((bfd_byte *) rawptr);
+      carsyms->name = stringbase;
-      carsyms->name = stringbase;
+      /* PR 17512: file: 4a1d50c1.  */
+      len = strnlen (stringbase, stringsize);
+      if (len < stringsize)
+	len ++;
+      stringbase += len;
-      stringbase += strlen (stringbase) + 1;
+      stringsize -= len;
       carsyms++;
+    }
   *stringbase = 0;
       /* Read the extended name.  We know its length.  */
       if (bfd_bread (extname, 20, abfd) != 20)
 	return FALSE;
       if (bfd_seek (abfd, -(file_ptr) (sizeof (hdr) + 20), SEEK_CUR) != 0)
 	return FALSE;
+      extname[20] = 0;
       if (CONST_STRNEQ (extname, "__.SYMDEF SORTED")
 	  || CONST_STRNEQ (extname, "__.SYMDEF"))
 	return do_slurp_bsd_armap (abfd);
+    }
       bfd_ardata (abfd)->extended_names = (char *) bfd_zalloc (abfd, amt + 1);
       if (bfd_ardata (abfd)->extended_names == NULL)
+	{
 	byebye:
 	  free (namedata);
+	  bfd_ardata (abfd)->extended_names = NULL;
+	  bfd_ardata (abfd)->extended_names_size = 0;
 	  return FALSE;
+	}
       if (bfd_bread (bfd_ardata (abfd)->extended_names, amt, abfd) != amt)
       /* Since the archive is supposed to be printable if it contains
 	 text, the entries in the list are newline-padded, not null
 	 padded. In SVR4-style archives, the names also have a
 	 trailing '/'.  DOS/NT created archive often have \ in them
-	 We'll fix all problems here..  */
+	 We'll fix all problems here.  */
+      {
 	char *ext_names = bfd_ardata (abfd)->extended_names;
 	char *temp = ext_names;
+	char *limit = temp + namedata->parsed_size;
 	char *limit = temp + namedata->parsed_size;
 	for (; temp < limit; ++temp)
+	  {
 	    if (*temp == ARFMAG[1])
 	      temp[temp > ext_names && temp[-1] == '/' ? -1 : 0] = '\0';
       bfd_set_error (bfd_error_invalid_operation);
       return -1;
+    }
+  hdr = arch_hdr (abfd);
+  /* PR 17512: file: 3d9e9fe9.  */
-  hdr = arch_hdr (abfd);
+  if (hdr == NULL)
     return -1;
 #define foo(arelt, stelt, size)				\
   buf->stelt = strtol (hdr->arelt, &aloser, size);	\
   if (aloser == hdr->arelt)	      			\
 			    goto error_return;
 			  map = new_map;
+			}
+		      if (strcmp (syms[src_count]->name, "__gnu_lto_slim") == 0)
+			(*_bfd_error_handler)
 			  (_("%s: plugin needed to handle lto object"),
 			   bfd_get_filename (current));
 		      namelen = strlen (syms[src_count]->name);
 		      amt = sizeof (char *);
 		      map[orl_count].name = (char **) bfd_alloc (arch, amt);
 	      BFD_ASSERT (((struct ar_cache *) *slot)->arbfd == abfd);
 	      htab_clear_slot (htab, slot);
+	    }
+	}
+    }
+  if (abfd->is_linker_output)
+    (*abfd->link.hash->hash_table_free) (abfd);
   return TRUE;
+}

Subversion Repositories Kolibri OS

(root)/contrib/toolchain/binutils/bfd/archive.c – Rev 5197 → 6324