FreeChainXenon/newlib-cygwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cygwin: console: Add error handling for thread_sync_event

Browse source 
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
This commit is contained in:
Takashi Yano 2024-06-29 19:03:20 +09:00
parent eaa606c0b7
commit 55baaac2ef
1 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
winsup/cygwin/fhandler/console.cc
View file

@ -272,9 +272,10 @@ cons_master_thread (VOID *arg)
fhandler_console::handle_set_t handle_set; fhandler_console::handle_set_t handle_set;
fh->get_duplicated_handle_set (&handle_set); fh->get_duplicated_handle_set (&handle_set);
HANDLE thread_sync_event; HANDLE thread_sync_event;
DuplicateHandle (GetCurrentProcess (), fh->thread_sync_event, if (DuplicateHandle (GetCurrentProcess (), fh->thread_sync_event,
GetCurrentProcess (), &thread_sync_event, GetCurrentProcess (), &thread_sync_event,
0, FALSE, DUPLICATE_SAME_ACCESS); 0, FALSE, DUPLICATE_SAME_ACCESS))
{
SetEvent (thread_sync_event); SetEvent (thread_sync_event);
master_thread_started = true; master_thread_started = true;
/* Do not touch class members after here because the class instance /* Do not touch class members after here because the class instance
@ -283,6 +284,11 @@ cons_master_thread (VOID *arg)
fhandler_console::close_handle_set (&handle_set); fhandler_console::close_handle_set (&handle_set);
SetEvent (thread_sync_event); SetEvent (thread_sync_event);
CloseHandle (thread_sync_event); CloseHandle (thread_sync_event);
master_thread_started = false;
}
else
debug_printf ("cons_master_thread not started because thread_sync_event "
"could not be duplicated %08x", GetLastError ());
return 0; return 0;
} }
@ -451,6 +457,8 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
case WAIT_CANCELED: case WAIT_CANCELED:
break; break;
default: /* Error */ default: /* Error */
free (input_rec);
free (input_tmp);
ReleaseMutex (p->input_mutex); ReleaseMutex (p->input_mutex);
return; return;
} }
@ -1847,10 +1855,13 @@ fhandler_console::open (int flags, mode_t)
char name[MAX_PATH]; char name[MAX_PATH];
shared_name (name, CONS_THREAD_SYNC, get_minor ()); shared_name (name, CONS_THREAD_SYNC, get_minor ());
thread_sync_event = CreateEvent(NULL, FALSE, FALSE, name); thread_sync_event = CreateEvent(NULL, FALSE, FALSE, name);
if (thread_sync_event)
{
new cygthread (::cons_master_thread, this, "consm"); new cygthread (::cons_master_thread, this, "consm");
WaitForSingleObject (thread_sync_event, INFINITE); WaitForSingleObject (thread_sync_event, INFINITE);
CloseHandle (thread_sync_event); CloseHandle (thread_sync_event);
} }
}
return 1; return 1;
} }
@ -1910,10 +1921,16 @@ fhandler_console::close ()
char name[MAX_PATH]; char name[MAX_PATH];
shared_name (name, CONS_THREAD_SYNC, get_minor ()); shared_name (name, CONS_THREAD_SYNC, get_minor ());
thread_sync_event = OpenEvent (MAXIMUM_ALLOWED, FALSE, name); thread_sync_event = OpenEvent (MAXIMUM_ALLOWED, FALSE, name);
if (thread_sync_event)
{
con.owner = MAX_PID + 1; con.owner = MAX_PID + 1;
WaitForSingleObject (thread_sync_event, INFINITE); WaitForSingleObject (thread_sync_event, INFINITE);
CloseHandle (thread_sync_event); CloseHandle (thread_sync_event);
} }
else
debug_printf ("Failed to open thread_sync_event %08x",
GetLastError ());
}
con.owner = 0; con.owner = 0;
} }