From owner-svn-src-stable@freebsd.org  Mon Mar  7 07:49:03 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EAC9AC20A0;
 Mon,  7 Mar 2016 07:49:03 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D5112CB;
 Mon,  7 Mar 2016 07:49:02 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u277n145023382;
 Mon, 7 Mar 2016 07:49:01 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u277n1AT023381;
 Mon, 7 Mar 2016 07:49:01 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201603070749.u277n1AT023381@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 7 Mar 2016 07:49:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r296437 - in stable: 10/contrib/binutils/bfd
 9/contrib/binutils/bfd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Mar 2016 07:49:03 -0000

Author: dim
Date: Mon Mar  7 07:49:01 2016
New Revision: 296437
URL: https://svnweb.freebsd.org/changeset/base/296437

Log:
  MFC r295901:
  
  Fix a problem in ld, causing it to sometimes print messages similar to
  "invalid string offset 65521 >= 27261 for section `.strtab'". for object
  files produced by recent versions of clang.
  
  In BFD's elf_create_symbuf() function, the size of the symbol buffer
  ('ssymbuf') is not calculated correctly, and the initial value for the
  'ssym' variable is off by one, since 'ssymbuf' has shndx_count + 1
  members.

Modified:
  stable/9/contrib/binutils/bfd/elf.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/   (props changed)
  stable/9/contrib/binutils/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/contrib/binutils/bfd/elf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/contrib/binutils/bfd/elf.c
==============================================================================
--- stable/9/contrib/binutils/bfd/elf.c	Mon Mar  7 07:46:17 2016	(r296436)
+++ stable/9/contrib/binutils/bfd/elf.c	Mon Mar  7 07:49:01 2016	(r296437)
@@ -8934,14 +8934,14 @@ elf_create_symbuf (bfd_size_type symcoun
 	shndx_count++;
 
   ssymbuf = bfd_malloc ((shndx_count + 1) * sizeof (*ssymbuf)
-			+ (indbufend - indbuf) * sizeof (*ssymbuf));
+			+ (indbufend - indbuf) * sizeof (*ssym));
   if (ssymbuf == NULL)
     {
       free (indbuf);
       return NULL;
     }
 
-  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count);
+  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count + 1);
   ssymbuf->ssym = NULL;
   ssymbuf->count = shndx_count;
   ssymbuf->st_shndx = 0;