diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-04-16 20:55:29 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-04-16 20:55:29 +0300 |
| commit | 10ce00efa8c9d4e9f2b588063ce04f7d49050d8b (patch) | |
| tree | f55846178825b57cf04ed284427422c8539b4a54 /src | |
| parent | 2394c9f2b79e5c9c121c21dcb324f9c18b473853 (diff) | |
| download | rneovim-10ce00efa8c9d4e9f2b588063ce04f7d49050d8b.tar.gz rneovim-10ce00efa8c9d4e9f2b588063ce04f7d49050d8b.tar.bz2 rneovim-10ce00efa8c9d4e9f2b588063ce04f7d49050d8b.zip | |
memline: Fix “NULL pointer dereference” warning
It was actually a false positive indicating always-true condition, not real
dereference.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/memline.c | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 45e16554e6..b31ca136dd 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -3362,29 +3362,32 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname, } if (swap_exists_action != SEA_NONE && choice == 0) { - char *name; + const char *const sw_msg_1 = _("Swap file \""); + const char *const sw_msg_2 = _("\" already exists!"); const size_t fname_len = strlen(fname); - name = xmalloc(fname_len - + strlen(_("Swap file \"")) - + strlen(_("\" already exists!")) + 5); - STRCPY(name, _("Swap file \"")); - home_replace(NULL, (char_u *) fname, (char_u *)&name[strlen(name)], - fname_len, true); - STRCAT(name, _("\" already exists!")); - choice = do_dialog(VIM_WARNING, - (char_u *)_("VIM - ATTENTION"), - (char_u *)(name == NULL - ? _("Swap file already exists!") - : name), + const size_t sw_msg_1_len = strlen(sw_msg_1); + const size_t sw_msg_2_len = strlen(sw_msg_2); + + const size_t name_len = sw_msg_1_len + fname_len + sw_msg_2_len + 5; + + char *const name = xmalloc(name_len); + memcpy(name, sw_msg_1, sw_msg_1_len + 1); + home_replace(NULL, (char_u *)fname, (char_u *)&name[sw_msg_1_len], + fname_len, true); + xstrlcat(name, sw_msg_2, name_len); + choice = do_dialog(VIM_WARNING, (char_u *)_("VIM - ATTENTION"), + (char_u *)name, # if defined(UNIX) - process_still_running - ? (char_u *)_( - "&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") : + process_still_running + ? (char_u *)_( + "&Open Read-Only\n&Edit anyway\n&Recover" + "\n&Quit\n&Abort") : # endif - (char_u *)_( - "&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), - 1, NULL, FALSE); + (char_u *)_( + "&Open Read-Only\n&Edit anyway\n&Recover" + "\n&Delete it\n&Quit\n&Abort"), + 1, NULL, false); # if defined(UNIX) if (process_still_running && choice >= 4) |