Author: svn-role
Date: Mon Apr 15 17:10:28 2013
New Revision: 1468147
URL: http://svn.apache.org/r1468147
Log:
Merge r1467807 from trunk:
* r1467807
Fix segfault when using --internal-diff
Justification:
It's a segfault.
Votes:
+1: breser, ivan, philip,
pburba (gratuitous 4th vote that I tried to commit seconds
after philip, but what the heck)
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/config.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1467807
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1468147&r1=1468146&r2=1468147&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Apr 15 17:10:28 2013
@@ -49,15 +49,6 @@ Approved changes:
Votes:
+1: danielsh, stsp, rhuijben
- * r1467807
- Fix segfault when using --internal-diff
- Justification:
- It's a segfault.
- Votes:
- +1: breser, ivan, philip,
- pburba (gratuitous 4th vote that I tried to commit seconds
- after philip, but what the heck)
-
* r1467803
Add missing linefeed in a message.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/config.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/config.c?rev=1468147&r1=1468146&r2=1468147&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/config.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/config.c Mon Apr 15
17:10:28 2013
@@ -464,7 +464,7 @@ make_string_from_option(const char **val
/* before attempting to expand an option, check for the placeholder.
* If none is there, there is no point in calling expand_option_value.
*/
- if (strchr(opt->value, '%'))
+ if (opt->value && strchr(opt->value, '%'))
{
apr_pool_t *tmp_pool = (x_pool ? x_pool :
svn_pool_create(cfg->x_pool));
