summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-05-16 22:03:28 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-05-16 22:03:28 +0000
commit28a5e958778bae84618a6eb57e4864d37c07cd0c (patch)
tree8ea54db8155373e0a2ca6d6f1973e66fcf01f7d4 /plugins
parent79b2ef62542fc62e0b3bf09413ce314b3e9c47b1 (diff)
crash fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@13657 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/TabSRMM/src/generic_msghandlers.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 8fcb10d750..dc427efe51 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1100,10 +1100,13 @@ LRESULT TSAPI DM_WMCopyHandler(HWND hwnd, WNDPROC oldWndProc, UINT msg, WPARAM w
LRESULT result = mir_callNextSubclass(hwnd, oldWndProc, msg, wParam, lParam);
ptrA szFromStream(Message_GetFromStream(hwnd, SF_TEXT | SFF_SELECTION));
- ptrW converted(mir_utf8decodeW(szFromStream));
-
- Utils::FilterEventMarkers(converted);
- Utils::CopyToClipBoard(converted, hwnd);
+ if (szFromStream != NULL) {
+ ptrW converted(mir_utf8decodeW(szFromStream));
+ if (converted != NULL) {
+ Utils::FilterEventMarkers(converted);
+ Utils::CopyToClipBoard(converted, hwnd);
+ }
+ }
return result;
}