thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1434: crash when adding package already in 'runtimepath'

Browse Source 
Problem:    Crash when adding package already in 'runtimepath'.
Solution:   Change order for using 'runtimepath' entries. (closes #12215)
This commit is contained in:
zeertzjq
2023-04-01 13:52:03 +01:00
committed by Bram Moolenaar
parent 869113f376
commit 39c9ec16ea
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/scriptfile.c
View File

@@ -718,18 +718,6 @@ add_pack_dir_to_rtp(char_u *fname)
char_u *cur_entry = entry;
copy_option_part(&entry, buf, MAXPATHL, ",");
if (insp == NULL)
{
add_pathsep(buf);
rtp_ffname = fix_fname(buf);
if (rtp_ffname == NULL)
goto theend;
match = vim_fnamencmp(rtp_ffname, ffname, fname_len) == 0;
vim_free(rtp_ffname);
if (match)
// Insert "ffname" after this entry (and comma).
insp = entry;
}
if ((p = (char_u *)strstr((char *)buf, "after")) != NULL
&& p > buf
@@ -743,6 +731,19 @@ add_pack_dir_to_rtp(char_u *fname)
after_insp = cur_entry;
break;
}
if (insp == NULL)
{
add_pathsep(buf);
rtp_ffname = fix_fname(buf);
if (rtp_ffname == NULL)
goto theend;
match = vim_fnamencmp(rtp_ffname, ffname, fname_len) == 0;
vim_free(rtp_ffname);
if (match)
// Insert "ffname" after this entry (and comma).
insp = entry;
}
}
if (insp == NULL)