From owner-svn-src-head@FreeBSD.ORG  Fri Aug  8 21:27:33 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 91016BF5
 for <svn-src-head@freebsd.org>; Fri,  8 Aug 2014 21:27:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62AC52EF6
 for <svn-src-head@freebsd.org>; Fri,  8 Aug 2014 21:27:33 +0000 (UTC)
Received: from dim (uid 1236) (envelope-from dim@FreeBSD.org) id 2ba5
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Fri, 08 Aug 2014 21:27:33 +0000
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 8 Aug 2014 21:27:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269740 - head/contrib/libc++/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e540c5.2ba5.21a63362@svn.freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Aug 2014 21:27:33 -0000

Author: dim
Date: Fri Aug  8 21:27:33 2014
New Revision: 269740
URL: http://svnweb.freebsd.org/changeset/base/269740

Log:
  Pull in r214736 from upstream libc++ trunk (by Marshall Clow):
  
    Fix PR#20520 - predicate called too many times in list::remove_if.
    Add tests for list, forward_list, and the std::remove_if algorithm
  
  This fixes an issue where std::list<>::remove_if() and remove() could
  erroneously visit elements twice.
  
  Reported by:	Dominic Fandrey <kamikaze@bsdforen.de>
  PR:		192303
  MFC after:	3 days

Modified:
  head/contrib/libc++/include/list

Modified: head/contrib/libc++/include/list
==============================================================================
--- head/contrib/libc++/include/list	Fri Aug  8 21:09:22 2014	(r269739)
+++ head/contrib/libc++/include/list	Fri Aug  8 21:27:33 2014	(r269740)
@@ -2046,6 +2046,8 @@ list<_Tp, _Alloc>::remove(const value_ty
             for (; __j != __e && *__j == __x; ++__j)
                 ;
             __i = erase(__i, __j);
+            if (__i != __e)
+                __i = _VSTD::next(__i);
         }
         else
             ++__i;
@@ -2065,6 +2067,8 @@ list<_Tp, _Alloc>::remove_if(_Pred __pre
             for (; __j != __e && __pred(*__j); ++__j)
                 ;
             __i = erase(__i, __j);
+            if (__i != __e)
+                __i = _VSTD::next(__i);
         }
         else
             ++__i;