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

patch 8.2.3910: when compare function of sort() fails it does not abort

Browse Source 
Problem:    When the compare function of sort() produces and error then sort()
            does not abort.
Solution:   Check if did_emsg was incremented.
This commit is contained in:
Bram Moolenaar
2021-12-27 11:54:37 +00:00
parent bbdd3fb804
commit 23018f2d4b
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/list.c
View File

@@ -1919,6 +1919,7 @@ item_compare2(const void *s1, const void *s2)
char_u *func_name;
partial_T *partial = sortinfo->item_compare_partial;
funcexe_T funcexe;
int did_emsg_before = did_emsg;
// shortcut after failure in previous call; compare all items equal
if (sortinfo->item_compare_func_err)
@@ -1946,7 +1947,7 @@ item_compare2(const void *s1, const void *s2)
clear_tv(&argv[0]);
clear_tv(&argv[1]);
if (res == FAIL)
if (res == FAIL || did_emsg > did_emsg_before)
res = ITEM_COMPARE_FAIL;
else
{