patch 9.1.1233: Coverity warns about NULL pointer when triggering WinResized
Problem: Coverity warns about NULL pointer when triggering WinResized
Solution: Add OOM checks for windows_list like for scroll_dict. Remove
void casts that are unnecessary after 9.1.1084 (zeertzjq).
closes: #16959
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
92e109fc13
commit
b42b9fc41f
@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1233,
|
||||||
/**/
|
/**/
|
||||||
1232,
|
1232,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
12
src/window.c
12
src/window.c
@ -3285,7 +3285,8 @@ may_trigger_win_scrolled_resized(void)
|
|||||||
{
|
{
|
||||||
// Create the list for v:event.windows before making the snapshot.
|
// Create the list for v:event.windows before making the snapshot.
|
||||||
windows_list = list_alloc_with_items(size_count);
|
windows_list = list_alloc_with_items(size_count);
|
||||||
(void)check_window_scroll_resize(NULL, NULL, NULL, windows_list, NULL);
|
if (windows_list != NULL)
|
||||||
|
check_window_scroll_resize(NULL, NULL, NULL, windows_list, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
dict_T *scroll_dict = NULL;
|
dict_T *scroll_dict = NULL;
|
||||||
@ -3296,8 +3297,7 @@ may_trigger_win_scrolled_resized(void)
|
|||||||
if (scroll_dict != NULL)
|
if (scroll_dict != NULL)
|
||||||
{
|
{
|
||||||
scroll_dict->dv_refcount = 1;
|
scroll_dict->dv_refcount = 1;
|
||||||
(void)check_window_scroll_resize(NULL, NULL, NULL, NULL,
|
check_window_scroll_resize(NULL, NULL, NULL, NULL, scroll_dict);
|
||||||
scroll_dict);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -3314,7 +3314,11 @@ may_trigger_win_scrolled_resized(void)
|
|||||||
recursive = TRUE;
|
recursive = TRUE;
|
||||||
|
|
||||||
// If both are to be triggered do WinResized first.
|
// If both are to be triggered do WinResized first.
|
||||||
if (trigger_resize)
|
if (trigger_resize
|
||||||
|
#ifdef FEAT_EVAL
|
||||||
|
&& windows_list != NULL
|
||||||
|
#endif
|
||||||
|
)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
save_v_event_T save_v_event;
|
save_v_event_T save_v_event;
|
||||||
|
|||||||
Reference in New Issue
Block a user