Author: svn-role
Date: Thu Apr 17 07:46:31 2014
New Revision: 1588148
URL: http://svn.apache.org/r1588148
Log:
Merge r1580832 from trunk:
* r1580832
Resolve 'svnrdump load' segfault deleting an 'svn:*' property (issue #4490)
Justification:
Simple fix for a segfault
Notes:
r1586668 on trunk is a regression test for this fix. Normally we'd
backport a regression test along with a fix but others have already
voted for the fix without it, so, as it's simple, I'm not bothering to
do so this time.
Votes:
+1: rhuijben, ivan, julianfoad
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svnrdump/util.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1580832
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1588148&r1=1588147&r2=1588148&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Apr 17 07:46:31 2014
@@ -355,13 +355,6 @@ Approved changes:
Votes:
+1: philip, julianfoad, rhuijben
- * r1587946
- Fix variable usage after it is out of scope.
- Justification:
- While not reported by users, this might cause hard to diagnose segfaults.
- Votes:
- +1: rhuijben, philip, steveking
-
* r1586439
Fix a crash in JavaHL that was reported on the users@ list and is
already fixed on trunk.
Modified: subversion/branches/1.8.x/subversion/svnrdump/util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnrdump/util.c?rev=1588148&r1=1588147&r2=1588148&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnrdump/util.c (original)
+++ subversion/branches/1.8.x/subversion/svnrdump/util.c Thu Apr 17 07:46:31
2014
@@ -35,7 +35,7 @@ svn_rdump__normalize_prop(const char *na
const svn_string_t **value,
apr_pool_t *result_pool)
{
- if (svn_prop_needs_translation(name))
+ if (svn_prop_needs_translation(name) && *value)
{
const char *cstring;
