From: Steve Dickson <steved@redhat.com>
To: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH 06/19] Removed bad frees from nfs/xcommon.c
Date: Wed, 8 May 2019 09:35:23 -0400 [thread overview]
Message-ID: <20190508133536.6077-7-steved@redhat.com> (raw)
In-Reply-To: <20190508133536.6077-1-steved@redhat.com>
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 <steved@redhat.com>
---
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
next prev parent reply other threads:[~2019-05-08 13:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-08 13:35 [PATCH 00/19] Covertity Scan: Removed resources leaks Steve Dickson
2019-05-08 13:35 ` [PATCH 01/19] Removed resource leaks from junction/path.c Steve Dickson
2019-05-08 13:35 ` [PATCH 02/19] Removed resource leaks from nfs/exports.c Steve Dickson
2019-05-08 13:35 ` [PATCH 03/19] Removed a resource leak from nfs/mydaemon.c Steve Dickson
2019-05-08 13:35 ` [PATCH 04/19] Removed a resource leak from nfs/rpcmisc.c Steve Dickson
2019-05-08 13:35 ` [PATCH 05/19] Removed a resource leak from nfs/svc_socket.c Steve Dickson
2019-05-08 13:35 ` Steve Dickson [this message]
2019-05-08 13:35 ` [PATCH 07/19] Removed resource leaks from nfs/xlog.c Steve Dickson
2019-05-08 13:35 ` [PATCH 08/19] Removed resource leaks from nfsidmap/libnfsidmap.c Steve Dickson
2019-05-08 13:35 ` [PATCH 09/19] Removed resource leaks from nfsidmap/static.c Steve Dickson
2019-05-08 13:35 ` [PATCH 10/19] Removed a resource leak from nsm/file.c Steve Dickson
2019-05-08 13:35 ` [PATCH 11/19] Removed resource leaks from systemd/rpc-pipefs-generator.c Steve Dickson
2019-05-08 13:35 ` [PATCH 12/19] Removed resource leaks from blkmapd/device-discovery.c Steve Dickson
2019-05-08 13:35 ` [PATCH 13/19] Removed resource leaks from gssd/krb5_util.c Steve Dickson
2019-05-08 13:35 ` [PATCH 14/19] Removed a resource leak from mount/configfile.c Steve Dickson
2019-05-08 13:35 ` [PATCH 15/19] Removed a resource leak from mount/nfsmount.c Steve Dickson
2019-05-08 13:35 ` [PATCH 16/19] Removed a resource leak from mount/stropts.c Steve Dickson
2019-05-08 13:35 ` [PATCH 17/19] Removed resource leaks from mountd/cache.c Steve Dickson
2019-05-08 13:35 ` [PATCH 18/19] Removed a resource leak from mountd/fsloc.c Steve Dickson
2019-05-08 13:35 ` [PATCH 19/19] Removed a resource leak from nfsdcltrack/sqlite.c Steve Dickson
2019-05-10 15:07 ` [PATCH 00/19] Covertity Scan: Removed resources leaks Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190508133536.6077-7-steved@redhat.com \
--to=steved@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox