fix possible export key problem

1 files changed, 18 insertions, 3 deletions

diff --git a/main.cpp b/main.cpp
index 913ecbf..c5a8847 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1568,10 +1568,25 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 			  {
 				  out.erase(s, 1);
 			  }
-			  TCHAR *tmp = mir_a2t(out.c_str());
+			  std::string::size_type p1 = 0, p2 = 0;
+			  p1 = out.find("-----BEGIN PGP PUBLIC KEY BLOCK-----");
+			  if(p1 != std::string::npos)
+			  {
+				  p2 = out.find("-----END PGP PUBLIC KEY BLOCK-----", p1);
+				  if(p2 != std::string::npos)
+				  {
+					  p2 += strlen("-----END PGP PUBLIC KEY BLOCK-----");
+					  out = out.substr(p1, p2-p1);
+					  TCHAR *tmp = mir_a2t(out.c_str());
+					  SetWindowText(hPubKeyEdit, tmp);
+					  mir_free(tmp);
+				  }
+				  else
+					  MessageBoxA(NULL, Translate("Failed to export public key."), Translate("Error"), MB_OK);
+			  }
+			  else
+				  MessageBoxA(NULL, Translate("Failed to export public key."), Translate("Error"), MB_OK);
 //			  SetDlgItemText(hPubKeyEdit, IDC_PUBLIC_KEY_EDIT, tmp);
-			  SetWindowText(hPubKeyEdit, tmp);
-			  mir_free(tmp);
 		  }
 		  DestroyWindow(hwndDlg);
 		  break;