BUG: restore_queue_signals(): q = 2 != queue_in = 3

BUG: restore_queue_signals(): q = 2 != queue_in = 3

[Daniel Shahaf]

Reproduction:

$ zsh -f
% autoload compinit
% compinit
% cd /t<TAB>88: exec.c:3855: BUG: q = 2 != queue_in = 3
mp/<CURSOR>

That line number is:

2643 execcmd_exec(Estate state, Execcmd_params eparams,
2645 {                                                                                                                       
3854                 dont_queue_signals();                                                                                   
3855                 if (!errflag)
3856                     lastval = execbuiltin(args, assigns, (Builtin) hn);
3857                 if (do_save & BINF_COMMAND)
3858                     errflag &= ~ERRFLAG_ERROR;
3859                 restore_queue_signals(q);

Further information:

% echo /t*
/tmp
% echo $ZSH_P<TAB>88: exec.c:3855: BUG: q = 2 != queue_in = 3
11: exec.c:3855: BUG: q = 2 != queue_in = 3
ATCHLEVEL 
zsh-5.3.1-62-gb007341

Re: BUG: restore_queue_signals(): q = 2 != queue_in = 3

[Bart Schaefer]

OK, this is one of those cases where I had to choose between HEAPDUP and
queue_signals() and I missed some "return" in the blocks.  There aren't
other globals being manipulated here so rather than try to catch all the
early "return" let's just drop use of PAT_STATIC.

diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c
index 49b338f..68bdf23 100644
--- a/Src/Zle/complete.c
+++ b/Src/Zle/complete.c
@@ -896,14 +896,12 @@ do_comp_vars(int test, int na, char *sa, int nb, char *sb, int mod)
 	    int i, l = arrlen(compwords), t = 0, b = 0, e = l - 1;
 	    Patprog pp;
 
-	    queue_signals();	/* Protect PAT_STATIC */
-
 	    i = compcurrent - 1;
 	    if (i < 0 || i >= l)
 		return 0;
 
 	    singsub(&sa);
-	    pp = patcompile(sa, PAT_STATIC, NULL);
+	    pp = patcompile(sa, PAT_HEAPDUP, NULL);
 
 	    for (i--, p = compwords + i; i >= 0; p--, i--) {
 		if (pattry(pp, *p)) {
@@ -932,9 +930,6 @@ do_comp_vars(int test, int na, char *sa, int nb, char *sb, int mod)
 		t = 0;
 	    if (t && mod)
 		restrict_range(b, e);
-
-	    unqueue_signals();
-
 	    return t;
 	}
     case CVT_PRENUM:
@@ -957,12 +952,10 @@ do_comp_vars(int test, int na, char *sa, int nb, char *sb, int mod)
 	{
 	    Patprog pp;
 
-	    queue_signals();	/* Protect PAT_STATIC */
-
 	    if (!na)
 		return 0;
 
-	    if (!(pp = patcompile(sa, PAT_STATIC, 0)))
+	    if (!(pp = patcompile(sa, PAT_HEAPDUP, 0)))
 		return 0;
 
 	    if (test == CVT_PREPAT) {
@@ -1043,9 +1036,6 @@ do_comp_vars(int test, int na, char *sa, int nb, char *sb, int mod)
 		if (mod)
 		    ignore_suffix(ol - (p - compsuffix));
 	    }
-
-	    unqueue_signals();
-
 	    return 1;
 	}
     }

-- 
Barton E. Schaefer