diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-03-20 07:56:30 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-03-20 07:56:30 -0700 |
| commit | 8672d19f0c0f25569e233bbd466b6c39f60c7a55 (patch) | |
| tree | b2d0fe5f56311f29e7fbde48bdadb72d81f28b01 /Src/pattern.c | |
| parent | fd4ac0a8c2c09a02275ee65eaf26f9dccf0de635 (diff) | |
| download | zsh-8672d19f0c0f25569e233bbd466b6c39f60c7a55.tar.gz zsh-8672d19f0c0f25569e233bbd466b6c39f60c7a55.tar.xz zsh-8672d19f0c0f25569e233bbd466b6c39f60c7a55.zip | |
32500: handle interrupts during pattern matching
Diffstat (limited to 'Src/pattern.c')
| -rw-r--r-- | Src/pattern.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Src/pattern.c b/Src/pattern.c index b79c3b444..94a299ebb 100644 --- a/Src/pattern.c +++ b/Src/pattern.c @@ -2223,6 +2223,8 @@ pattryrefs(Patprog prog, char *string, int stringlen, int unmetalen, return ret; } else { + int q = queue_signal_level(); + /* * Test for a `must match' string, unless we're scanning for a match * in which case we don't need to do this each time. @@ -2270,6 +2272,8 @@ pattryrefs(Patprog prog, char *string, int stringlen, int unmetalen, patinput = patinstart; + dont_queue_signals(); + if (patmatch((Upat)progstr)) { /* * we were lazy and didn't save the globflags if an exclusion @@ -2406,6 +2410,8 @@ pattryrefs(Patprog prog, char *string, int stringlen, int unmetalen, } else ret = 0; + restore_queue_signals(q); + if (tryalloced) zfree(tryalloced, unmetalen + unmetalenp); @@ -2485,7 +2491,7 @@ patmatch(Upat prog) zrange_t from, to, comp; patint_t nextch; - while (scan) { + while (scan && !errflag) { next = PATNEXT(scan); if (!globdots && P_NOTDOT(scan) && patinput == patinstart && |