X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ddecd643be56256929ae1c45bebb8e39ae032225..01c034ad857128c51482a563befb374e38ebe668:/puttygen.c?ds=sidebyside

diff --git a/puttygen.c b/puttygen.c
index ac5079e0..6f5d8164 100644
--- a/puttygen.c
+++ b/puttygen.c
@@ -93,7 +93,7 @@ struct PassphraseProcStruct {
  */
 static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
                                    WPARAM wParam, LPARAM lParam) {
-    static char *passphrase;
+    static char *passphrase = NULL;
     struct PassphraseProcStruct *p;
 
     switch (msg) {
@@ -121,6 +121,7 @@ static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
         if (p->comment)
             SetDlgItemText(hwnd, 101, p->comment);
         *passphrase = 0;
+        SetDlgItemText(hwnd, 102, passphrase);
         return 0;
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
@@ -134,7 +135,7 @@ static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
 	    EndDialog (hwnd, 0);
 	    return 0;
           case 102:                    /* edit box */
-	    if (HIWORD(wParam) == EN_CHANGE) {
+	    if ((HIWORD(wParam) == EN_CHANGE) && passphrase) {
                 GetDlgItemText (hwnd, 102, passphrase, PASSPHRASE_MAXLEN-1);
                 passphrase[PASSPHRASE_MAXLEN-1] = '\0';
             }