1 files changed, 4 insertions, 2 deletions
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 197172ee2..ae931e791 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -578,9 +578,11 @@ substitute_line (char *buffer)
         }
       if (p[1] == '{' && *pend == '}')
         {
-          *pend++ = 0;
+          int save = *pend;
+          *pend = 0;
           freeme = get_var_ext (p+2);
           value = freeme;
+          *pend++ = save;
         }
       else if (*pend)
         {
@@ -615,7 +617,7 @@ substitute_line (char *buffer)
           n += valuelen;
           strcpy (dst + n, pend);
           line = dst + n;
-          free (result);
+          xfree (result);
           result = dst;
         }
       xfree (freeme);