Cygwin: pty: Make close_pseudoconsole() be a static member function.

- The function close_pseudoconsole() should be static so that it
  can be safely called in spawn.cc even after the fhandler_pty_slave
  instance has been deleted. That is, there is a problem with the
  current code. This patch fixes the issue.

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 45ac17af2450ec52a597480cc0000f1f2842f640..2077b524526073b35d34eb5da239877c2442a228 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -2339,12 +2339,13 @@ class fhandler_pty_slave: public fhandler_pty_common
     return fh;
   }
   bool setup_pseudoconsole (STARTUPINFOEXW *si, bool nopcon);
-  void close_pseudoconsole (void);
+  static void close_pseudoconsole (tty *ttyp);
   bool term_has_pcon_cap (const WCHAR *env);
   void set_switch_to_pcon (void);
   void reset_switch_to_pcon (void);
   void mask_switch_to_pcon_in (bool mask);
   void setup_locale (void);
+  tty *get_ttyp () { return (tty *) tc (); } /* Override as public */
 };
 
 #define __ptsname(buf, unit) __small_sprintf ((buf), "/dev/pty%d", (unit))

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 8ff74cddee26e144ffda7cf49805c0e1e83a30fc..0c92f41d438322fc953c1bc3ed6310e4234ace99 100644 (file)
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2563,21 +2563,23 @@ fallback:
   return false;
 }
 
+/* The function close_pseudoconsole() should be static so that it can
+   be called even after the fhandler_pty_slave instance is deleted. */
 void
-fhandler_pty_slave::close_pseudoconsole (void)
+fhandler_pty_slave::close_pseudoconsole (tty *ttyp)
 {
-  if (get_ttyp ()->h_pseudo_console)
+  if (ttyp->h_pseudo_console)
     {
-      get_ttyp ()->wait_pcon_fwd ();
-      HPCON_INTERNAL *hp = (HPCON_INTERNAL *) get_ttyp ()->h_pseudo_console;
+      ttyp->wait_pcon_fwd ();
+      HPCON_INTERNAL *hp = (HPCON_INTERNAL *) ttyp->h_pseudo_console;
       HANDLE tmp = hp->hConHostProcess;
-      ClosePseudoConsole (get_ttyp ()->h_pseudo_console);
+      ClosePseudoConsole (ttyp->h_pseudo_console);
       CloseHandle (tmp);
-      get_ttyp ()->h_pseudo_console = NULL;
-      get_ttyp ()->switch_to_pcon_in = false;
-      get_ttyp ()->pcon_pid = 0;
-      get_ttyp ()->pcon_start = false;
-      get_ttyp ()->do_not_resize_pcon = false;
+      ttyp->h_pseudo_console = NULL;
+      ttyp->switch_to_pcon_in = false;
+      ttyp->pcon_pid = 0;
+      ttyp->pcon_start = false;
+      ttyp->do_not_resize_pcon = false;
     }
 }
 

diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 94909df4cec43c94669d411f4848858e3df657b3..bf1b080570247f011b82711de8085b9c0d23533a 100644 (file)
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -664,6 +664,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
        init_console_handler (myself->ctty > 0);
 
       bool enable_pcon = false;
+      tty *ptys_ttyp = NULL;
       STARTUPINFOEXW si_pcon;
       ZeroMemory (&si_pcon, sizeof (si_pcon));
       STARTUPINFOW *si_tmp = &si;
@@ -677,6 +678,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
              c_flags |= EXTENDED_STARTUPINFO_PRESENT;
              si_tmp = &si_pcon.StartupInfo;
              enable_pcon = true;
+             ptys_ttyp = ptys_primary->get_ttyp ();
            }
        }
 
@@ -954,7 +956,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
          if (enable_pcon)
            {
              WaitForSingleObject (pi.hProcess, INFINITE);
-             ptys_primary->close_pseudoconsole ();
+             fhandler_pty_slave::close_pseudoconsole (ptys_ttyp);
            }
          else if (cons_native)
            {
@@ -973,7 +975,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
          if (waitpid (cygpid, &res, 0) != cygpid)
            res = -1;
          if (enable_pcon)
-           ptys_primary->close_pseudoconsole ();
+           fhandler_pty_slave::close_pseudoconsole (ptys_ttyp);
          else if (cons_native)
            {
              fhandler_console::request_xterm_mode_output (true,