patch 8.0.1496: clearing a pointer takes two lines
Problem: Clearing a pointer takes two lines.
Solution: Add VIM_CLEAR() and replace vim_clear(). (Hirohito Higashi,
closes #2629)
diff --git a/src/screen.c b/src/screen.c
index f365be2..ce9b6e9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4326,10 +4326,7 @@
#endif
if (p_extra_free != NULL)
- {
- vim_free(p_extra_free);
- p_extra_free = NULL;
- }
+ VIM_CLEAR(p_extra_free);
/*
* Get a character from the line itself.
*/
@@ -8860,27 +8857,17 @@
* and over again. */
done_outofmem_msg = TRUE;
}
- vim_free(new_ScreenLines);
- new_ScreenLines = NULL;
+ VIM_CLEAR(new_ScreenLines);
#ifdef FEAT_MBYTE
- vim_free(new_ScreenLinesUC);
- new_ScreenLinesUC = NULL;
+ VIM_CLEAR(new_ScreenLinesUC);
for (i = 0; i < p_mco; ++i)
- {
- vim_free(new_ScreenLinesC[i]);
- new_ScreenLinesC[i] = NULL;
- }
- vim_free(new_ScreenLines2);
- new_ScreenLines2 = NULL;
+ VIM_CLEAR(new_ScreenLinesC[i]);
+ VIM_CLEAR(new_ScreenLines2);
#endif
- vim_free(new_ScreenAttrs);
- new_ScreenAttrs = NULL;
- vim_free(new_LineOffset);
- new_LineOffset = NULL;
- vim_free(new_LineWraps);
- new_LineWraps = NULL;
- vim_free(new_TabPageIdxs);
- new_TabPageIdxs = NULL;
+ VIM_CLEAR(new_ScreenAttrs);
+ VIM_CLEAR(new_LineOffset);
+ VIM_CLEAR(new_LineWraps);
+ VIM_CLEAR(new_TabPageIdxs);
}
else
{