[[[
Fix --internal-diff coredump due to NULL pointer in string routine.

* subversion/libsvn_subr/config.c
  (make_string_from_option): Add test to ensure that the string passed
    to strcmp is not a NULL value.
]]]
Index: subversion/libsvn_subr/config.c
===================================================================
--- subversion/libsvn_subr/config.c	(revision 1465268)
+++ subversion/libsvn_subr/config.c	(working copy)
@@ -464,7 +464,7 @@ make_string_from_option(const char **valuep, svn_c
       /* 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));
 

Reply via email to