Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp5023449yba; Wed, 8 May 2019 06:47:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwHq0wRoigKpqa9ReX1xsqAUEjmnmET7uIGwc8dnFcOwGEKuewEyzURldKm1c9Hkp5btc9o X-Received: by 2002:a17:902:5a2:: with SMTP id f31mr46953336plf.119.1557323265202; Wed, 08 May 2019 06:47:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557323265; cv=none; d=google.com; s=arc-20160816; b=U5xgUJE1CwYQNkNmWOVLQX5sKu+88aWiMdHUwSJEeUQOaRD1oDQ0rSKxJcQfn4oLQ1 a22QQD4BmonfvwzZyxv1tv16Y3iE2a9xYg1UughBw0AK+seiCxgcIw3289zZ927KrAxt X/tj6NLoUvkFSRi9nVqULWIYsmgcQ7AA07jPDWQEUjRGUkma28npPpAUsgbCbcfFwAZz pvdSqMLYxXfrTY7W8Q9kF0ju857VxaA+jFPiT6zUlIyQ8mkwOtR7tEkUgk6v23Lx+/Wt lVvL42Dghskae1vhBMoWl/kWuirim/znGeO9CKve9Rq7n+L7WP91+Ucxe2piIOEZIwFS VO6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=rX16fVFZOonKiYh1AARCNiDRACUIw6bbr6MHMR3zmHM=; b=Lx9LoaGGda1t6dnaJD1qCr2sESwgVbl8mWocnp4waqNaR5tkkx2eBYdiall6gVdaaF QcwpzhrmQHBnKAwdwDUVfIQr+39q8QSxKFdeL1VIRqBX3o2wT0jMTofiIS++VKzfeiP1 awTYpkbhOqukumt8FK51sF2ubiPhr6y3p7IyGxC3UgUhSO7ckJHjFGf4ai44X+1rjEoT UhIRhoOl05plUoYHTQajGAWcGOzY/LnBRI1aX051Kzg1SsUjptt5cwiJdVqbkFcVge8U c6tc3jxChEJApEtSEbmIQPR0366FijddZJUvRc0mTcDw2NLPOpZvHIc35JlyX1N3bnWj 6SGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b67si24790399plb.206.2019.05.08.06.47.28; Wed, 08 May 2019 06:47:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727270AbfEHNfo (ORCPT + 99 others); Wed, 8 May 2019 09:35:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53868 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727242AbfEHNfn (ORCPT ); Wed, 8 May 2019 09:35:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9DA13079B90 for ; Wed, 8 May 2019 13:35:42 +0000 (UTC) Received: from madhat.boston.devel.redhat.com (ovpn-116-59.phx2.redhat.com [10.3.116.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id A33415C640 for ; Wed, 8 May 2019 13:35:42 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH 06/19] Removed bad frees from nfs/xcommon.c Date: Wed, 8 May 2019 09:35:23 -0400 Message-Id: <20190508133536.6077-7-steved@redhat.com> In-Reply-To: <20190508133536.6077-1-steved@redhat.com> References: <20190508133536.6077-1-steved@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 08 May 2019 13:35:42 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org nfs/xcommon.c:63: incorrect_free: "free" frees incorrect pointer "(void *)s". nfs/xcommon.c:81: incorrect_free: "free" frees incorrect pointer "(void *)s". Signed-off-by: Steve Dickson --- support/nfs/xcommon.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c index 14e580e..3989f0b 100644 --- a/support/nfs/xcommon.c +++ b/support/nfs/xcommon.c @@ -53,14 +53,17 @@ char * xstrconcat3 (const char *s, const char *t, const char *u) { char *res; - if (!s) s = ""; + int dofree = 1; + + if (!s) s = "", dofree=0; if (!t) t = ""; if (!u) u = ""; res = xmalloc(strlen(s) + strlen(t) + strlen(u) + 1); strcpy(res, s); strcat(res, t); strcat(res, u); - free((void *) s); + if (dofree) + free((void *) s); return res; } @@ -69,7 +72,9 @@ char * xstrconcat4 (const char *s, const char *t, const char *u, const char *v) { char *res; - if (!s) s = ""; + int dofree = 1; + + if (!s) s = "", dofree=0; if (!t) t = ""; if (!u) u = ""; if (!v) v = ""; @@ -78,7 +83,8 @@ xstrconcat4 (const char *s, const char *t, const char *u, const char *v) { strcat(res, t); strcat(res, u); strcat(res, v); - free((void *) s); + if (dofree) + free((void *) s); return res; } -- 2.20.1