From owner-svn-src-all@FreeBSD.ORG  Tue Mar 13 19:40:57 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2B012106564A;
	Tue, 13 Mar 2012 19:40:57 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A7DF8FC08;
	Tue, 13 Mar 2012 19:40:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2DJeuKs059412;
	Tue, 13 Mar 2012 19:40:56 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2DJeu8u059410;
	Tue, 13 Mar 2012 19:40:56 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201203131940.q2DJeu8u059410@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 13 Mar 2012 19:40:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232934 - head/contrib/gdb/gdb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Mar 2012 19:40:57 -0000

Author: dim
Date: Tue Mar 13 19:40:56 2012
New Revision: 232934
URL: http://svn.freebsd.org/changeset/base/232934

Log:
  Pull in a fix (still under GPLv2) for a double free in gdb, leading to
  an assert, which can occur if you repeatedly dlopen() and dlclose() a
  .so file in a tight loop.  This was reported on freebsd-current@ by
  Alexandre Martins, with a sample to reproduce the behaviour.
  
  Obtained from:	http://sourceware.org/git/?p=gdb.git;a=commit;h=a6f2cbb341520f8e100f4b8305979dd6207a79e8

Modified:
  head/contrib/gdb/gdb/target.c

Modified: head/contrib/gdb/gdb/target.c
==============================================================================
--- head/contrib/gdb/gdb/target.c	Tue Mar 13 19:18:34 2012	(r232933)
+++ head/contrib/gdb/gdb/target.c	Tue Mar 13 19:40:56 2012	(r232934)
@@ -1425,6 +1425,13 @@ target_resize_to_sections (struct target
 	      (*t)->to_sections_end = target->to_sections_end;
 	    }
 	}
+      /* There is a flattened view of the target stack in current_target,
+	 so its to_sections pointer might also need updating. */
+      if (current_target.to_sections == old_value)
+	{
+	  current_target.to_sections = target->to_sections;
+	  current_target.to_sections_end = target->to_sections_end;
+	}
     }
   
   return old_count;