[ros-diffs] [reactos] 01/01: [ATL] Add NULL-check in CWindowImplBaseT::WindowProc assertions

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e076e0576f80d996151c0…

commit e076e0576f80d996151c049ba2543c091a3ebd7c
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Thu Mar 11 21:20:40 2021 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Thu Mar 11 21:20:40 2021 +0900

    [ATL] Add NULL-check in CWindowImplBaseT::WindowProc assertions
    
    CORE-17505
---
 sdk/lib/atl/atlwin.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h
index 71d28fe2989..c25fd1404d0 100644
--- a/sdk/lib/atl/atlwin.h
+++ b/sdk/lib/atl/atlwin.h
@@ -1579,8 +1579,8 @@ public:
         LONG_PTR saveWindowProc;
 
         ATLASSERT(pThis != NULL);
-        ATLASSERT((pThis->m_dwState & WINSTATE_DESTROYED) == 0);
-        ATLASSERT(pThis->m_hWnd != NULL);
+        ATLASSERT(pThis != NULL && (pThis->m_dwState & WINSTATE_DESTROYED)
== 0);
+        ATLASSERT(pThis != NULL && pThis->m_hWnd != NULL);
         if (pThis == NULL || (pThis->m_dwState & WINSTATE_DESTROYED) != 0 ||
pThis->m_hWnd == NULL)
             return 0;