From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28992 invoked by alias); 6 Jan 2015 05:34:25 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 34114 Received: (qmail 1600 invoked from network); 6 Jan 2015 05:34:23 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=47uXmmJPOtUrOISs17eP3OxXPUDE6G8s41433jen3Rs=; b=T8f/RtmncBJwp26sp4V1wexsXn6UVrCVXo/Y3O2u2v/koHTJzlg7ZouHNiwONq+0+B t2m/g0QZe3tbSapssqnruzG9irDOb/5GMEi0Qaqk8ch+sj+GM+f/xHghsPK7y9fd2gJF Z6nrHnmQyk4b0z/nWNXA74II6ie77qO1GZ2gBQo8rPpQz/h4gFIJjIuq7zlQS4fwzlgh 7zSnFfcx9uLzD0YphDvn5G1TmqX8N1z6wplQUtstqcXPMxeXadIngEh4ELlrqZQru7SK lGDWG0vQxdp7dtneaYFl5t863JDNsLF+Qo+jl4WBlKf3Oq3cx4GgTJauREUvIBLCmIdO GkzQ== X-Received: by 10.194.63.51 with SMTP id d19mr153924654wjs.77.1420521966737; Mon, 05 Jan 2015 21:26:06 -0800 (PST) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH 01/17: emulate: Handle aborting from mixed -L/-c correctly Date: Tue, 6 Jan 2015 06:25:33 +0100 Message-Id: <1420521949-30483-2-git-send-email-mikachu@gmail.com> X-Mailer: git-send-email 2.2.0.GIT In-Reply-To: <1420521949-30483-1-git-send-email-mikachu@gmail.com> References: <1420521949-30483-1-git-send-email-mikachu@gmail.com> Somehow Coverity found this (Issue 1255797, Failure to restore non-local value). --- Src/builtin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/builtin.c b/Src/builtin.c index ebc0654..2b9c4de 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -5171,7 +5171,7 @@ bin_emulate(UNUSED(char *nam), char **argv, Options ops, UNUSED(int func)) if (cmd) { if (opt_L) { zwarnnam("emulate", "option -L incompatible with -c"); - goto restore; + goto restore2; } *--argv = cmd; /* on stack, never free()d, see execbuiltin() */ } else @@ -5209,6 +5209,7 @@ bin_emulate(UNUSED(char *nam), char **argv, Options ops, UNUSED(int func)) } ret = eval(argv); sticky = save_sticky; +restore2: emulation = saveemulation; memcpy(opts, saveopts, sizeof(opts)); restorepatterndisables(savepatterns); -- 2.2.0.GIT