From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 3967 invoked from network); 5 Jun 2020 13:43:03 -0000 Received: from ns1.primenet.com.au (HELO primenet.com.au) (203.24.36.2) by inbox.vuxu.org with ESMTPUTF8; 5 Jun 2020 13:43:03 -0000 Received: (qmail 5784 invoked by alias); 5 Jun 2020 13:42:55 -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: List-Unsubscribe: X-Seq: 45985 Received: (qmail 21565 invoked by uid 1010); 5 Jun 2020 13:42:54 -0000 X-Qmail-Scanner-Diagnostics: from mail-lf1-f52.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.3/25828. spamassassin: 3.4.4. Clear:RC:0(209.85.167.52):SA:0(-2.0/5.0):. Processed in 4.359149 secs); 05 Jun 2020 13:42:54 -0000 X-Envelope-From: mikachu@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.167.52 as permitted sender) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=khQcRXZzcrBArjtaRWbKzM8XlGCmbvtHi/YpaLtc1WA=; b=dBv/1Fb72EJq9wxbfvoWtatZqG8uCU3Ul+uMUh8GdlWQ5cXRqnlf+ZnvpbS6po75rt t1Pys5K729aZRrjo0M9tiQItO+aQZatk4OgGeOhU+8egzkOM14L4V9W7k/r7py3+2a2e Z5VtUDzZKJCA0Ulrj4UG9ktxGjK6y1SxjTaYi+1rxHPcANOCR3ajx6FRCvkYOrU3HFsa 71TuiL3BuOhVj8HWKka5DWJtz1qDcuhjmMsY4NkLcRkAd8c0WhsdngwmVfmpkTX/Wicf j5uEZ3ll4MbZTRRb2+YTAQ/z/LdpRMZEPwfKTtgCqd7QbJWXhHh3NuimQ++ePxRJrTtG 8EtA== X-Gm-Message-State: AOAM531bRR4ChsdMPH6e81BWN+TsvIwVBcwsNtLQuA8AHWRHsdllh6Ce 6zI5WVYTDQMcpjdM/rY1RIQNjFAb X-Google-Smtp-Source: ABdhPJz/hFgohyBMIrs32vB0CkxicNU6n6N2x+tmuTH+QpxMhPQDwbhEqhGE4wU/GpEtRd/xTM8uxQ== X-Received: by 2002:a19:4b12:: with SMTP id y18mr5300064lfa.169.1591364535189; Fri, 05 Jun 2020 06:42:15 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: typeset: Fix leaving corrupted entries in paramtab Date: Fri, 5 Jun 2020 15:42:08 +0200 Message-Id: <20200605134208.32082-1-mikachu@gmail.com> X-Mailer: git-send-email 2.15.1 This appears to fix the problem in 45984, but I would appreciate someone checking if it seems sane and/or complete. --- Src/builtin.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Src/builtin.c b/Src/builtin.c index 7a0c83e84d..010b2bd94f 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -2480,12 +2480,16 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func), return NULL; } if (on & (PM_LEFT | PM_RIGHT_B | PM_RIGHT_Z)) { - if (typeset_setwidth(cname, pm, ops, on, 0)) + if (typeset_setwidth(cname, pm, ops, on, 0)) { + unsetparam_pm(pm, 0, 1); return NULL; + } } if (on & (PM_INTEGER | PM_EFLOAT | PM_FFLOAT)) { - if (typeset_setbase(cname, pm, ops, on, 0)) + if (typeset_setbase(cname, pm, ops, on, 0)) { + unsetparam_pm(pm, 0, 1); return NULL; + } } } else { if (idigit(*pname)) @@ -2503,8 +2507,10 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func), */ struct tieddata *tdp = (struct tieddata *) zalloc(sizeof(struct tieddata)); - if (!tdp) + if (!tdp) { + unsetparam_pm(pm, 0, 1); return NULL; + } tdp->joinchar = joinchar; tdp->arrptr = &altpm->u.arr; -- 2.15.1