MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 05:51:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

GTW-9933 fix crashing when writing to non-working stdout/stderr (e.g. called from the restarter in ssh)

Browse Source 
GitOrigin-RevId: 6465bf7c1dfbad4ea215eccf83faf7319ea38e1d
This commit is contained in:
Ivan Pashchenko
2024-10-02 14:50:35 +02:00
committed by intellij-monorepo-bot
parent 504d1c21e7
commit 7ac40165cd
1 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
native/XPlatLauncher/src/lib.rs
View File

@@ -39,11 +39,14 @@ use serde::Deserialize;
#[cfg(target_os = "windows")]
use {
windows::core::{HSTRING, GUID, PCWSTR, PWSTR},
std::io::Write,
std::ptr::null_mut,
windows::Win32::Foundation,
windows::Win32::UI::Shell,
windows::Win32::System::Console::{AllocConsole, ATTACH_PARENT_PROCESS, AttachConsole},
windows::Win32::Foundation::HANDLE,
windows::Win32::System::Console::{ATTACH_PARENT_PROCESS, AttachConsole, SetStdHandle, STD_ERROR_HANDLE, STD_OUTPUT_HANDLE},
windows::Win32::System::LibraryLoader,
windows::Win32::UI::Shell,
windows::core::{HSTRING, GUID, PCWSTR, PWSTR},
};
#[cfg(target_family = "unix")]
@@ -93,12 +96,39 @@ pub fn main_lib() {
#[cfg(target_os = "windows")]
fn attach_console() {
unsafe {
let mut err = None;
if AttachConsole(ATTACH_PARENT_PROCESS).is_err() {
eprintln!("AttachConsole(ATTACH_PARENT_PROCESS): {:?}", Foundation::GetLastError());
if AllocConsole().is_err() {
eprintln!("AllocConsole(): {:?}", Foundation::GetLastError());
err = Some(Foundation::GetLastError());
}
// case: races when restarting in remote-dev on Windows
// (ssh session -> tb proxy -> tb agent -> IDE -> restarter.exe (dying too fast) -> IDE)
// cannot repro on a smaller setup (e.g. cmd /C via ssh)
// * case: console is alive, but in a state of being closed
// * AttachConsole does not always error
// * GetStdHandle for STD_OUT_HANDLE returns without errors and the handle is not zero/invalid
// * println!/eprintln! panics when it can't write
// * setting various process creation flags in restarter does not seem to help
// this is the only reliable way I've found to check if it's possible to call println! without panic
if writeln!(std::io::stderr(), ".").is_err() {
// usually it's Os { code: 232, kind: BrokenPipe, message: "The pipe is being closed." }
// but even if it's some other error, let's not write there
// passing null here is not explicitly documented,
// but it works and is consistent with the GetStdHandle returning null
if SetStdHandle(STD_ERROR_HANDLE, HANDLE(null_mut())).is_err() {
std::process::exit(1011)
}
}
if writeln!(std::io::stdout(), ".").is_err() {
if SetStdHandle(STD_OUTPUT_HANDLE, HANDLE(null_mut())).is_err() {
std::process::exit(1012)
}
}
if let Some(err) = err {
eprintln!("AttachConsole(ATTACH_PARENT_PROCESS): {:?}", err)
}
}
}