You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2015/07/20 15:21:19 UTC

svn commit: r1691928 - /subversion/trunk/subversion/libsvn_subr/gpg_agent.c

Author: julianfoad
Date: Mon Jul 20 13:21:19 2015
New Revision: 1691928

URL: http://svn.apache.org/r1691928
Log:
Fix issue #4584, "Non-canonical $HOME crashes GPG-agent support code".

This is a minimal fix, suitable for back-porting. The issue was introduced in 1.8.11.

* subversion/libsvn_subr/gpg_agent.c
  (find_running_gpg_agent): Canonicalize the home directory before using it.

Modified:
    subversion/trunk/subversion/libsvn_subr/gpg_agent.c

Modified: subversion/trunk/subversion/libsvn_subr/gpg_agent.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/gpg_agent.c?rev=1691928&r1=1691927&r2=1691928&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/trunk/subversion/libsvn_subr/gpg_agent.c Mon Jul 20 13:21:19 2015
@@ -232,6 +232,7 @@ find_running_gpg_agent(int *new_sd, apr_
       if (!homedir)
         return SVN_NO_ERROR;
 
+      homedir = svn_dirent_canonicalize(homedir, pool);
       socket_name = svn_dirent_join_many(pool, homedir, ".gnupg",
                                          "S.gpg-agent", SVN_VA_NULL);
     }