From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 1 Jun 2017 05:38:04 +0000 (-0700)
Subject: Free cwd when no longer needed
X-Git-Tag: emacs-26.0.90~521^2~202
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=877e808440d4bc2e62d6fb509defee91a3fdc895;p=emacs.git

Free cwd when no longer needed

* lib-src/emacsclient.c (main): Don’t dally when freeing cwd.
---

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 3a0715f137e..8828b7652de 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -208,7 +208,7 @@ char *get_current_dir_name (void);
 /* Return the current working directory.  Returns NULL on errors.
    Any other returned value must be freed with free.  This is used
    only when get_current_dir_name is not defined on the system.  */
-char*
+char *
 get_current_dir_name (void)
 {
   char *buf;
@@ -1702,6 +1702,7 @@ main (int argc, char **argv)
   if (tramp_prefix)
     quote_argument (emacs_socket, tramp_prefix);
   quote_argument (emacs_socket, cwd);
+  free (cwd);
   send_to_emacs (emacs_socket, "/");
   send_to_emacs (emacs_socket, " ");
 
@@ -1945,8 +1946,6 @@ main (int argc, char **argv)
   if (rl < 0)
     exit_status = EXIT_FAILURE;
 
-  free (cwd);                   /* Keep leak checkers happy.  */
-
   CLOSE_SOCKET (emacs_socket);
   return exit_status;
 }