--- old/src/java.desktop/windows/native/libawt/windows/awt_List.cpp 2018-11-08 22:30:43.254364663 +0530 +++ new/src/java.desktop/windows/native/libawt/windows/awt_List.cpp 2018-11-08 22:30:42.718364663 +0530 @@ -478,16 +478,22 @@ MsgRouting AwtList::HandleEvent(MSG *msg, BOOL synthetic) { if (IsFocusingMouseMessage(msg)) { - LONG item = static_cast(SendListMessage(LB_ITEMFROMPOINT, 0, msg->lParam)); - if (item != LB_ERR) { - if (isMultiSelect) { - if (IsItemSelected(item)) { - Deselect(item); - } else { - Select(item); + LONG count = GetCount(); + if (count > 0) { + LONG item = static_cast(SendListMessage(LB_ITEMFROMPOINT, 0, msg->lParam)); + if (HIWORD(item) == 0) { + item = LOWORD(item); + if (item >= 0 && item < count) { + if (isMultiSelect) { + if (IsItemSelected(item)) { + Deselect(item); + } else { + Select(item); + } + } else { + Select(item); + } } - } else { - Select(item); } } delete msg;