diff options
Diffstat (limited to 'subversion/libsvn_subr/config.c')
-rw-r--r-- | subversion/libsvn_subr/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/subversion/libsvn_subr/config.c b/subversion/libsvn_subr/config.c index 94aecd3..cf97f0d 100644 --- a/subversion/libsvn_subr/config.c +++ b/subversion/libsvn_subr/config.c @@ -487,14 +487,15 @@ make_string_from_option(const char **valuep, svn_config_t *cfg, expand_option_value(cfg, section, opt->value, &opt->x_value, tmp_pool); opt->expanded = TRUE; - if (!x_pool) + if (x_pool != cfg->x_pool) { /* Grab the fully expanded value from tmp_pool before its disappearing act. */ if (opt->x_value) opt->x_value = apr_pstrmemdup(cfg->x_pool, opt->x_value, strlen(opt->x_value)); - svn_pool_destroy(tmp_pool); + if (!x_pool) + svn_pool_destroy(tmp_pool); } } else |