From fe869e77674f8e18ea984e2cc3a663fab80c1055 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Tue, 25 Nov 2014 11:31:16 +0000 Subject: Add nullptr checks for offline messages parser. git-svn-id: http://svn.miranda-ng.org/main/trunk@11052 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/MraOfflineMsg.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'protocols/MRA') diff --git a/protocols/MRA/src/MraOfflineMsg.cpp b/protocols/MRA/src/MraOfflineMsg.cpp index 72095a872f..67bff4d22a 100644 --- a/protocols/MRA/src/MraOfflineMsg.cpp +++ b/protocols/MRA/src/MraOfflineMsg.cpp @@ -164,7 +164,7 @@ static DWORD PlainText2message(const CMStringA &szContentType, const CMStringA & DWORD MraOfflineMessageGet(CMStringA *plpsMsg, DWORD *pdwTime, DWORD *pdwFlags, CMStringA *plpsEMail, CMStringA *plpsText, CMStringA *plpsRTFText, CMStringA *plpsMultiChatData) { - if (plpsMsg == NULL || plpsMsg->IsEmpty()) + if (plpsMsg == NULL || plpsMsg->IsEmpty() || plpsText == NULL) return ERROR_INVALID_HANDLE; LPSTR lpszHeader, lpszBody, lpszContentTypeLow; @@ -175,8 +175,9 @@ DWORD MraOfflineMessageGet(CMStringA *plpsMsg, DWORD *pdwTime, DWORD *pdwFlags, return ERROR_INVALID_HANDLE; ptrA lpszHeaderLow((LPSTR)mir_calloc(dwHeaderSize)); - if (lpszHeaderLow) - BuffToLowerCase(lpszHeaderLow, lpszHeader, dwHeaderSize); + if (lpszHeaderLow == NULL) + return ERROR_OUTOFMEMORY; + BuffToLowerCase(lpszHeaderLow, lpszHeader, dwHeaderSize); if (pdwTime) if (MraOfflineMessageGetHeaderValue(lpszHeader, lpszHeaderLow, dwHeaderSize, "date", 4, szTemp) == NO_ERROR) { -- cgit v1.2.3