aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.0132: script may be re-used when deleting and creating a new one

Browse Source 
Problem:    Script may be re-used when deleting and creating a new one.
Solution:   When the inode matches, also check the file name.
This commit is contained in:
Bram Moolenaar
2020-01-19 20:18:09 +01:00
parent 479950f6c9
commit ca33eb256e
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/scriptfile.c
View File

@@ -1249,18 +1249,20 @@ do_source(
--current_sctx.sc_sid)
{
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_name != NULL
&& (
if (si->sn_name != NULL)
{
# ifdef UNIX
// Compare dev/ino when possible, it catches symbolic
// links. Also compare file names, the inode may change
// when the file was edited.
((stat_ok && si->sn_dev_valid)
&& (si->sn_dev == st.st_dev
&& si->sn_ino == st.st_ino)) ||
// Compare dev/ino when possible, it catches symbolic links. Also
// compare file names, the inode may change when the file was
// edited or it may be re-used for another script (esp. in tests).
if ((stat_ok && si->sn_dev_valid)
&& (si->sn_dev != st.st_dev || si->sn_ino != st.st_ino))
continue;
# endif
fnamecmp(si->sn_name, fname_exp) == 0))
break;
if (fnamecmp(si->sn_name, fname_exp) == 0)
// Found it!
break;
}
}
if (current_sctx.sc_sid == 0)
{