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=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 12285 invoked from network); 4 Oct 2022 17:54:41 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 4 Oct 2022 17:54:41 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1664906081; b=JvLple5cxTqQ+9SeICCbhHlBvErRG1K7pB1a+pISqOLJvbtfnQsLYf70Rc+azX7dPUc/6210D/ /m3N2QqKxVzZsKSc9ezKtDnuTAAOC/TIQF3XYkzZkd4NO755T8NYbCkCuaIOVo1WN0plc2XTbB ooKF7CVtNyHSQ7qfiOdqmbSByY35eTsa9gPt4mwACt72YzntieTylfsXfT7SUeaKMqGGpTtKjQ IyEkP8LCPFPXqeXRFh4vF6U3u0Sa5EuBLx3A94s2cdVAGl0a5J59EXbNKjcpayWuOI210Za27V GEnJnu2TiZTBpfaSzuMtJDtudZHSnKW71OrWs63Yy8vqzQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (lxh-heta-043.node.capitar.com) smtp.remote-ip=159.69.137.90; dmarc=none header.from=opperschaap.net; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1664906081; bh=BcLhwleoZXNolhsyFTK9dB01ZnZsjYxtNhg6tUEd4LY=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:To:From:DKIM-Signature; b=r1ORhx+kNWrqyhz2UQPI1KPIRpY2SvtBfbmMWeBrCwFgRMwswX4IIDHNImcfc/c3kMt8F8iFuJ 1w3HNNaJAQooJs6veJQBPYMsAn+R3u8x0KxDnhMVHEKJxBulcseJkac7uuKQNCvA8Rbh8+gjNx DjSoe8doQ2SjDbnGOQKGTbjjRobFk1nmA1PjLzm6jfy9HpjQO09A+WWSriP+vXjOI3jUYQlG9/ wHmlT/qdZdd04WeubHf/krij9dSyCahB64RZPVPUBAKqDretLmQqIIFKycFGGKoEc8WqNkvhQ9 YOMJYCBXCwdVm1mqedNG8PMlAYe6EspSDovzKjgo1r5/cw==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=hMjqbxGuRzGgeMxjIjjJl8cg61IjUlVxT05xlbUeu/s=; b=NVOmpmcK+KFb/aov1TXhfXkopm 49kOiA/zAMvHDaSoKMAzrKqRs+5YD05oAfTY4rPA05bH7s1/WuNcnOBOTcvxZcThyTC8KnMCCP2e2 /yokaVfnyPJad4WG0HzDOdjxevcTWRlYdDE6sLx2Bs6iDUNw7qXciEZKmLM8pksNLagXkkTYp0J82 heNpf1kWJh/5NDg4iVkjX3Pxe9ZXzLS7zkAQkHxP8c4K4v+LgEPdF1fznDfAchzNXWupq9oBJvlf3 BFtPpqrpvvfrUm7YA155m5yDWmk+32N1zsWFRxIqRERf8oDRBMehy5QZ2MfSTfHtAFplB3+F6lXun qaCjCjag==; Received: from authenticated user by zero.zsh.org with local id 1ofm7s-000FDU-6Y; Tue, 04 Oct 2022 17:54:40 +0000 Authentication-Results: zsh.org; iprev=pass (lxh-heta-043.node.capitar.com) smtp.remote-ip=159.69.137.90; dmarc=none header.from=opperschaap.net; arc=none Received: from lxh-heta-043.node.capitar.com ([159.69.137.90]:36060) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1ofm7J-000Esm-NW; Tue, 04 Oct 2022 17:54:06 +0000 Received: from lxh-heta-043.node.capitar.com (localhost [127.0.0.1]) by eur-mail-proxy-p02.zt.capitar.com (Postfix) with ESMTPS id 7B7902393C for ; Tue, 4 Oct 2022 19:54:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by eur-mail-proxy-p02.zt.capitar.com (Postfix) with ESMTP id 2B7492393B for ; Tue, 4 Oct 2022 19:54:05 +0200 (CEST) Received: from lxh-heta-043.node.capitar.com ([127.0.0.1]) by localhost (eur-mail-proxy-p02.zt.capitar.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id DXByy5oaS_bt for ; Tue, 4 Oct 2022 19:54:05 +0200 (CEST) Received: from neptune.setarnet.aw (unknown [186.189.151.69]) by eur-mail-proxy-p02.zt.capitar.com (Postfix) with ESMTPSA id 2597323BAD for ; Tue, 4 Oct 2022 19:54:03 +0200 (CEST) From: Wesley Schwengle To: zsh-workers@zsh.org Subject: [PATCH] Silence use-after-free warning in compmatch.c Date: Tue, 4 Oct 2022 13:53:34 -0400 Message-Id: <20221004175333.1250799-2-wesleys@opperschaap.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221004175333.1250799-1-wesleys@opperschaap.net> References: <20221004175333.1250799-1-wesleys@opperschaap.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=J7XUEzvS c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=Hb/lXKkKiutk7skFILyYNg==:17 a=IkcTkHD0fZMA:10 a=Qawa6l4ZSaYA:10 a=N3miCFJ7AAAA:8 a=Ot3Cd5izHgGKqBQYQ_QA:9 a=QEXdDO2ut3YA:10 a=V5H4rQgsk92nlYCD-KPC:22 X-Seq: 50736 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: compmatch.c:2081:26: warning: pointer =E2=80=98or=E2=80=99 used after =E2= =80=98realloc=E2=80=99 [-Wuse-after-free] Signed-off-by: Wesley Schwengle --- Src/Zle/compmatch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index 56e5509a4..ddcecd589 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -2045,12 +2045,12 @@ join_strs(int la, char *sa, int lb, char *sb) zlelineasstring(line, mp->llen, 0, &convlen, NULL, 0); if (rr <=3D convlen) { - char *or =3D rs; + ptrdiff_t diff =3D rp - rs; int alloclen =3D (convlen > 20) ? convlen : 20; =20 rs =3D realloc(rs, (rl +=3D alloclen)); rr +=3D alloclen; - rp +=3D rs - or; + rp =3D rs + diff; } memcpy(rp, convstr, convlen); rp +=3D convlen; @@ -2073,11 +2073,11 @@ join_strs(int la, char *sa, int lb, char *sb) } else { /* Same character, just take it. */ if (rr <=3D 1 /* HERE charlen */) { - char *or =3D rs; + ptrdiff_t diff =3D rp - rs; =20 rs =3D realloc(rs, (rl +=3D 20)); rr +=3D 20; - rp +=3D rs - or; + rp =3D rs + diff; } /* HERE: multibyte char */ *rp++ =3D *sa; --=20 2.38.0