diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-10-15 19:10:56 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-10-15 19:10:56 +0200 |
commit | 74f8eece5e481220e3c0767487c0bb59fa916ed6 (patch) | |
tree | 53821a3ba3698d4f33955caf6dc228a70db70f11 /src/popupwin.c | |
parent | 209f0208f7831c6ab8f3f1cab473cb21e7985fc3 (diff) |
patch 8.2.1848: crash when passing a NULL string or list to popup_settext()v8.2.1848
Problem: Crashyyyyy passing a NULL string or list to popup_settext().
Solution: Check for NULL pointers. (closes #7132)
Diffstat (limited to 'src/popupwin.c')
-rw-r--r-- | src/popupwin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/popupwin.c b/src/popupwin.c index 05db1af631..777e7d84b1 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -1595,14 +1595,16 @@ popup_set_buffer_text(buf_T *buf, typval_T text) // Add text to the buffer. if (text.v_type == VAR_STRING) { + char_u *s = text.vval.v_string; + // just a string - ml_append_buf(buf, 0, text.vval.v_string, (colnr_T)0, TRUE); + ml_append_buf(buf, 0, s == NULL ? (char_u *)"" : s, (colnr_T)0, TRUE); } else { list_T *l = text.vval.v_list; - if (l->lv_len > 0) + if (l != NULL && l->lv_len > 0) { if (l->lv_first->li_tv.v_type == VAR_STRING) // list of strings |