diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2018-02-17 22:35:32 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2018-02-17 22:35:32 +0000 |
| commit | 5b946f6c4ddb82d2436c5012e719d470802987d0 (patch) | |
| tree | fc0d0efcc662019c23d884b2a1fb8daffe77fe58 | |
| parent | 7492f1e9ed00b96df43bb307d4d3253ecea606d9 (diff) | |
| download | zsh-5b946f6c4ddb82d2436c5012e719d470802987d0.tar.gz zsh-5b946f6c4ddb82d2436c5012e719d470802987d0.tar.xz zsh-5b946f6c4ddb82d2436c5012e719d470802987d0.zip | |
42362: protect REPORTTIME logic from bad status
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/jobs.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 21dd91629..d1696e196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-02-17 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 42362: Src/jobs.c: protet REPORTTIME logic from bad status. + 2018-02-13 Peter Stephenson <p.stephenson@samsung.com> * Eitan Adler: Doc/Zsh/params.yo: REPORTMEMORY is in kilobytes, diff --git a/Src/jobs.c b/Src/jobs.c index fc5bfacc6..503618f47 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -925,6 +925,7 @@ should_report_time(Job j) struct value vbuf; Value v; char *s = "REPORTTIME"; + int save_errflag = errflag; zlong reporttime = -1; #ifdef HAVE_GETRUSAGE char *sm = "REPORTMEMORY"; @@ -936,12 +937,14 @@ should_report_time(Job j) return 1; queue_signals(); + errflag = 0; if ((v = getvalue(&vbuf, &s, 0))) reporttime = getintvalue(v); #ifdef HAVE_GETRUSAGE if ((v = getvalue(&vbuf, &sm, 0))) reportmemory = getintvalue(v); #endif + errflag = save_errflag; unqueue_signals(); if (reporttime < 0 #ifdef HAVE_GETRUSAGE |