From b0748aa072eb9256b397e6b77cd17d044f143a46 Mon Sep 17 00:00:00 2001
From: dev747368 <48332326+dev747368@users.noreply.github.com>
Date: Tue, 14 Feb 2023 17:55:27 -0500
Subject: [PATCH] GP-3100 fix file system password input dialog NPE

---
 .../ghidra/formats/gfilesystem/crypto/PasswordDialog.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PasswordDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PasswordDialog.java
index 6aa83b4138..1b09e11030 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PasswordDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PasswordDialog.java
@@ -111,6 +111,13 @@ class PasswordDialog extends DialogComponentProvider {
 		}
 	}
 
+	@Override
+	public void close() {
+		// override default close behavior to prevent dispose() from being called before
+		// the password value is retrieved
+		closeDialog();
+	}
+
 	@Override
 	protected void okCallback() {
 		resultState = RESULT_STATE.OK;