f

jonahgraham · Dec 18, 2024 · 78147fd · 78147fd
1 parent 73ba67c
commit 78147fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/ConPTY.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/ConPTY.java
@@ -239,14 +239,18 @@ public synchronized void close() throws IOException {
 		}
 		boolean res;
 
-		res = ConPTYKernel32.INSTANCE.CloseHandle(handles.processInformation.hThread);
-		checkErr(res, "CloseHandle processInformation.hThread"); //$NON-NLS-1$
+		if (handles.processInformation != null) {
+			res = ConPTYKernel32.INSTANCE.CloseHandle(handles.processInformation.hThread);
+			checkErr(res, "CloseHandle processInformation.hThread"); //$NON-NLS-1$
 
-		res = ConPTYKernel32.INSTANCE.CloseHandle(handles.processInformation.hProcess);
-		checkErr(res, "CloseHandle processInformation.hProcess"); //$NON-NLS-1$
+			res = ConPTYKernel32.INSTANCE.CloseHandle(handles.processInformation.hProcess);
+			checkErr(res, "CloseHandle processInformation.hProcess"); //$NON-NLS-1$
+		}
 
-		ConPTYKernel32.INSTANCE.DeleteProcThreadAttributeList(handles.startupInfo.lpAttributeList);
-		handles.threadAttributeListMemory.clear();
+		if (handles.startupInfo != null) {
+			ConPTYKernel32.INSTANCE.DeleteProcThreadAttributeList(handles.startupInfo.lpAttributeList);
+			handles.threadAttributeListMemory.clear();
+		}
 
 		ConPTYKernel32.INSTANCE.ClosePseudoConsole(handles.pseudoConsole.getValue());
 

diff --git a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYInputStream.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYInputStream.java
@@ -93,9 +93,4 @@ protected void finalize() throws IOException {
 	private native int read0(int fd, byte[] buf, int len) throws IOException;
 
 	private native int close0(int fd) throws IOException;
-
-	static {
-		System.loadLibrary("pty"); //$NON-NLS-1$
-	}
-
 }
diff --git a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYOutputStream.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYOutputStream.java
@@ -100,9 +100,4 @@ protected void finalize() throws IOException {
 	private native int write0(int fd, byte[] b, int len) throws IOException;
 
 	private native int close0(int fd) throws IOException;
-
-	static {
-		System.loadLibrary("pty"); //$NON-NLS-1$
-	}
-
 }