From ad3c8ebaa08c7e83142e6a6c2ce7b8fe9abf4083 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Mon, 21 Jul 2014 20:54:17 +0800 Subject: [PATCH] Avoid crash of paste null string to UI's text --- Windows/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Windows/main.cpp b/Windows/main.cpp index a258fef7b3..a398364c87 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -170,7 +170,10 @@ std::string System_GetProperty(SystemProperty prop) { if (OpenClipboard(MainWindow::GetDisplayHWND())) { HANDLE handle = GetClipboardData(CF_UNICODETEXT); const wchar_t *wstr = (const wchar_t*)GlobalLock(handle); - retval = ConvertWStringToUTF8(wstr); + if (wstr) + retval = ConvertWStringToUTF8(wstr); + else + retval = ""; GlobalUnlock(handle); CloseClipboard(); }