From bcba9306227ade497e98b50ff65feac0ae3dca3b Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Thu, 11 Mar 2021 16:55:49 +0900
Subject: [PATCH] [BROWSEUI] Fix CAutoComplete::OnMeasureItem assertion

CORE-17505
---
 dll/win32/browseui/CAutoComplete.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp
index 9bb6405d594..b5dfa888abd 100644
--- a/dll/win32/browseui/CAutoComplete.cpp
+++ b/dll/win32/browseui/CAutoComplete.cpp
@@ -1781,7 +1781,8 @@ LRESULT CAutoComplete::OnMeasureItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
     ATLASSERT(pMeasure != NULL);
     if (pMeasure->CtlType != ODT_LISTVIEW)
         return FALSE;
-
+    if (!m_hwndList)
+        return FALSE;
     ATLASSERT(m_hwndList.GetStyle() & LVS_OWNERDRAWFIXED);
     pMeasure->itemHeight = m_hwndList.m_cyItem; // height of item
     return TRUE;