Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52C2410E0A for ; Mon, 6 Jan 2014 04:04:58 +0000 (UTC) Received: (qmail 1454 invoked by uid 500); 6 Jan 2014 04:04:52 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 1428 invoked by uid 500); 6 Jan 2014 04:04:48 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 1418 invoked by uid 99); 6 Jan 2014 04:04:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jan 2014 04:04:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jan 2014 04:04:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BCE492388B42; Mon, 6 Jan 2014 04:04:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1555656 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_client/util.c Date: Mon, 06 Jan 2014 04:04:10 -0000 To: commits@subversion.apache.org From: svn-role@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140106040410.BCE492388B42@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: svn-role Date: Mon Jan 6 04:04:10 2014 New Revision: 1555656 URL: http://svn.apache.org/r1555656 Log: Merge r1550803 from trunk: * r1550803 Fix pool lifetime of variables in svn_client_commit_item3_t when duplicated. Justification: Pool lifetime issues are bad, and debugging them hard. Votes: +1: rhuijben, danielsh, stefan2 Modified: subversion/branches/1.8.x/ (props changed) subversion/branches/1.8.x/STATUS subversion/branches/1.8.x/subversion/libsvn_client/util.c Propchange: subversion/branches/1.8.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1550803 Modified: subversion/branches/1.8.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1555656&r1=1555655&r2=1555656&view=diff ============================================================================== --- subversion/branches/1.8.x/STATUS (original) +++ subversion/branches/1.8.x/STATUS Mon Jan 6 04:04:10 2014 @@ -277,10 +277,3 @@ Veto-blocked changes: Approved changes: ================= - * r1550803 - Fix pool lifetime of variables in svn_client_commit_item3_t when duplicated. - Justification: - Pool lifetime issues are bad, and debugging them hard. - Votes: - +1: rhuijben, danielsh, stefan2 - Modified: subversion/branches/1.8.x/subversion/libsvn_client/util.c URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/util.c?rev=1555656&r1=1555655&r2=1555656&view=diff ============================================================================== --- subversion/branches/1.8.x/subversion/libsvn_client/util.c (original) +++ subversion/branches/1.8.x/subversion/libsvn_client/util.c Mon Jan 6 04:04:10 2014 @@ -166,6 +166,13 @@ svn_client_commit_item3_dup(const svn_cl new_item->outgoing_prop_changes = svn_prop_array_dup(new_item->outgoing_prop_changes, pool); + if (new_item->session_relpath) + new_item->session_relpath = apr_pstrdup(pool, new_item->session_relpath); + + if (new_item->moved_from_abspath) + new_item->moved_from_abspath = apr_pstrdup(pool, + new_item->moved_from_abspath); + return new_item; }