From e6b2c1aafe3e877e3a6a90df006887d0b5f59f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Mon, 11 Aug 2014 13:52:39 +0000 Subject: Facebook: Fix various ptrA issues (potential crashes) git-svn-id: http://svn.miranda-ng.org/main/trunk@10152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/dialogs.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'protocols/FacebookRM/src/dialogs.cpp') diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp index c3af445c23..4f77b2c53d 100644 --- a/protocols/FacebookRM/src/dialogs.cpp +++ b/protocols/FacebookRM/src/dialogs.cpp @@ -152,8 +152,15 @@ void GetSelectedContacts(FacebookProto *proto, MCONTACT hItem, HWND hwndList, st } else { if (SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) { facebook_user *fu = new facebook_user(); - fu->user_id = ptrA(proto->getStringA(hItem, FACEBOOK_KEY_ID)); - fu->real_name = _T2A(ptrT(proto->getTStringA(hItem, FACEBOOK_KEY_NICK))); + + ptrA userId(proto->getStringA(hItem, FACEBOOK_KEY_ID)); + if (userId) + fu->user_id = userId; + + ptrt realName(proto->getTStringA(hItem, FACEBOOK_KEY_NICK)); + if (realName) + fu->real_name = _T2A(realName); + contacts->push_back(fu); } } @@ -265,7 +272,7 @@ INT_PTR CALLBACK FBMindProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara TCHAR mindMessageT[FACEBOOK_MIND_LIMIT+1]; TCHAR urlT[1024]; - TCHAR placeT[100]; + TCHAR placeT[100]; GetDlgItemText(hwnd, IDC_MINDMSG, mindMessageT, SIZEOF(mindMessageT)); GetDlgItemText(hwnd, IDC_PLACE, placeT, SIZEOF(placeT)); -- cgit v1.2.3