[newlib-cygwin] Cygwin: pty: Avoid potential segfault in PTY code when ppid = 1.

Ken Brown kbrown@sourceware.org
Fri Sep 20 21:59:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=831b1569dc8a1ab9a9767f525eca17fccdb3e0d0

commit 831b1569dc8a1ab9a9767f525eca17fccdb3e0d0
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Wed Sep 18 23:29:17 2019 +0900

    Cygwin: pty: Avoid potential segfault in PTY code when ppid = 1.

Diff:
---
 winsup/cygwin/fhandler_tty.cc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 659e7b5..2a1c34f 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -137,9 +137,16 @@ force_attach_to_pcon (HANDLE h)
 		/* If the process is running on a console,
 		   the parent process should be attached
 		   to the same console. */
-		pinfo p (myself->ppid);
+		DWORD attach_wpid;
+		if (myself->ppid == 1)
+		  attach_wpid = ATTACH_PARENT_PROCESS;
+		else
+		  {
+		    pinfo p (myself->ppid);
+		    attach_wpid = p->dwProcessId;
+		  }
 		FreeConsole ();
-		if (AttachConsole (p->dwProcessId))
+		if (AttachConsole (attach_wpid))
 		  {
 		    pcon_attached_to = -1;
 		    attach_done = true;



More information about the Cygwin-cvs mailing list