subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1819200 - in /subversion/branches/1.10.x: ./ STATUS subversion/svn/help-cmd.c
Date Sun, 24 Dec 2017 04:00:08 GMT
Author: svn-role
Date: Sun Dec 24 04:00:08 2017
New Revision: 1819200

URL: http://svn.apache.org/viewvc?rev=1819200&view=rev
Log:
Merge r1817856 from trunk:

 * r1817856
   Fix segfault when no home directory is available.
   Justification:
     API violation: svn_config_get_user_config() may return NULL.
   Votes:
     +1: danielsh, jamessan, stefan2

Modified:
    subversion/branches/1.10.x/   (props changed)
    subversion/branches/1.10.x/STATUS
    subversion/branches/1.10.x/subversion/svn/help-cmd.c

Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 24 04:00:08 2017
@@ -99,4 +99,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837
+/subversion/trunk:1817837,1817856

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1819200&r1=1819199&r2=1819200&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Dec 24 04:00:08 2017
@@ -70,11 +70,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1817856
-   Fix segfault when no home directory is available.
-   Justification:
-     API violation: svn_config_get_user_config() may return NULL.
-   Votes:
-     +1: danielsh, jamessan, stefan2
-

Modified: subversion/branches/1.10.x/subversion/svn/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/help-cmd.c?rev=1819200&r1=1819199&r2=1819200&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svn/help-cmd.c (original)
+++ subversion/branches/1.10.x/subversion/svn/help-cmd.c Sun Dec 24 04:00:08 2017
@@ -148,21 +148,24 @@ svn_cl__help(apr_getopt_t *os,
                            _("\nThe following authentication credential caches are available:\n\n"));
 
   /*### There is no API to query available providers at run time. */
+  if (config_path)
+    {
 #if (defined(WIN32) && !defined(__MINGW32__))
-  version_footer =
-    svn_stringbuf_create(apr_psprintf(pool, _("%s* Wincrypt cache in %s\n"),
-                                      version_footer->data,
-                                      svn_dirent_local_style(config_path,
-                                                             pool)),
-                         pool);
+      version_footer =
+        svn_stringbuf_create(apr_psprintf(pool, _("%s* Wincrypt cache in %s\n"),
+                                          version_footer->data,
+                                          svn_dirent_local_style(config_path,
+                                                                 pool)),
+                             pool);
 #elif !defined(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE)
-  version_footer =
-    svn_stringbuf_create(apr_psprintf(pool, _("%s* Plaintext cache in %s\n"),
-                                      version_footer->data,
-                                      svn_dirent_local_style(config_path,
-                                                             pool)),
-                         pool);
+      version_footer =
+        svn_stringbuf_create(apr_psprintf(pool, _("%s* Plaintext cache in %s\n"),
+                                          version_footer->data,
+                                          svn_dirent_local_style(config_path,
+                                                                 pool)),
+                             pool);
 #endif
+    }
 #ifdef SVN_HAVE_GNOME_KEYRING
   svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
 #endif



Mime
View raw message