neovim

commit 4c886d0e732b1e5626b7c410b142ccd0b0868cb7
parent 6967c08840bedfecc54884af815b75ff7ab7af7b
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sat,  3 Aug 2024 08:14:31 +0800

vim-patch:9.1.0653: Patch v9.1.0648 not completely right

Problem:  Patch v9.1.0648 not completely right
          (zeertzjq)
Solution: Remove always true condition

closes: vim/vim#15415

https://github.com/vim/vim/commit/a0b5bc12850f1d87fa51fb7be42df0ea835ccf21

Co-authored-by: Christian Brabandt <cb@256bit.org>

Diffstat:
M
src/nvim/ex_cmds2.c
 | 
5
+----

1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
@@ -227,12 +227,9 @@ void dialog_changed(buf_T *buf, bool checkall)
 
     // restore to empty when write failed
     if (empty_bufname) {
-      // prevent double free
-      if (buf->b_sfname != buf->b_ffname) {
-        XFREE_CLEAR(buf->b_sfname);
-      }
       buf->b_fname = NULL;
       XFREE_CLEAR(buf->b_ffname);
+      XFREE_CLEAR(buf->b_sfname);
       unchanged(buf, true, false);
     }
   } else if (ret == VIM_NO) {