Author: svn-role
Date: Fri Aug 1 18:59:32 2014
New Revision: 1615202
URL: http://svn.apache.org/r1615202
Log:
Merge r1606009 from trunk:
* r1606009
Allocate hash values in hash pool to avoid lifetime issue.
Justification:
Avoids use-after-clear (on trunk) detected by valgrind.
Notes:
Fix is logically correct but not really needed at present.
Votes:
+1: philip, rhuijben, breser
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_ra_serf/options.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1606009
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1615202&r1=1615201&r2=1615202&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Aug 1 18:59:32 2014
@@ -189,15 +189,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1606009
- Allocate hash values in hash pool to avoid lifetime issue.
- Justification:
- Avoids use-after-clear (on trunk) detected by valgrind.
- Notes:
- Fix is logically correct but not really needed at present.
- Votes:
- +1: philip, rhuijben, breser
-
* r1547454, r1561703
In FSFS, omit config file when creating pre-1.5 format repositories.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/options.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/options.c?rev=1615202&r1=1615201&r2=1615202&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/options.c Fri Aug 1
18:59:32 2014
@@ -302,7 +302,7 @@ capabilities_headers_iterator_callback(v
/* May contain multiple values, separated by commas. */
int i;
apr_array_header_t *vals = svn_cstring_split(val, ",", TRUE,
- opt_ctx->pool);
+ session->pool);
for (i = 0; i < vals->nelts; i++)
{
