Mercurial > vim

diff src/term.c @ 16586:5ebb2c87d1f5 v8.1.1296

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1296: crash when using invalid command line argument commit https://github.com/vim/vim/commit/27821260c0afaac85cb1c10627f1d7fbe48860ae Author: Bram Moolenaar <Bram@vim.org> Date: Wed May 8 16:41:09 2019 +0200 patch 8.1.1296: crash when using invalid command line argument Problem: Crash when using invalid command line argument. Solution: Check for options not being initialized.
author Bram Moolenaar <Bram@vim.org>
date Wed, 08 May 2019 16:45:07 +0200
parents a72ad8a8b249
children d4e74f9f7ae9
line wrap: on
line diff
--- a/src/term.c
+++ b/src/term.c
@@ -3014,13 +3014,13 @@ term_settitle(char_u *title)
     void
 term_push_title(int which)
 {
-    if ((which & SAVE_RESTORE_TITLE) && *T_CST != NUL)
+    if ((which & SAVE_RESTORE_TITLE) && T_CST != NULL && *T_CST != NUL)
     {
 	OUT_STR(T_CST);
 	out_flush();
     }
 
-    if ((which & SAVE_RESTORE_ICON) && *T_SSI != NUL)
+    if ((which & SAVE_RESTORE_ICON) && T_SSI != NULL && *T_SSI != NUL)
     {
 	OUT_STR(T_SSI);
 	out_flush();
@@ -3033,13 +3033,13 @@ term_push_title(int which)
     void
 term_pop_title(int which)
 {
-    if ((which & SAVE_RESTORE_TITLE) && *T_CRT != NUL)
+    if ((which & SAVE_RESTORE_TITLE) && T_CRT != NULL && *T_CRT != NUL)
     {
 	OUT_STR(T_CRT);
 	out_flush();
     }
 
-    if ((which & SAVE_RESTORE_ICON) && *T_SRI != NUL)
+    if ((which & SAVE_RESTORE_ICON) && T_SRI != NULL && *T_SRI != NUL)
     {
 	OUT_STR(T_SRI);
 	out_flush();