Date: Wed, 28 Apr 2021 00:12:10 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 7452b2e44be6 - stable/12 - libkiconv: address memory leak in not-found cases Message-ID: <202104280012.13S0CAQo021452@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7452b2e44be687ba2916b1a80fbbe281f3edffb2 commit 7452b2e44be687ba2916b1a80fbbe281f3edffb2 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2021-04-21 17:45:27 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2021-04-28 00:11:42 +0000 libkiconv: address memory leak in not-found cases Found in "Understanding and Detecting Disordered Error Handling with Precise Function Pairing" by Qiushi Wu et al. Reviewed by: imp, jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29896 (cherry picked from commit 3cfd08c1c74058451a02bac35307bf7fa509c617) --- lib/libkiconv/kiconv_sysctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libkiconv/kiconv_sysctl.c b/lib/libkiconv/kiconv_sysctl.c index da68b3011f36..841a162bfd27 100644 --- a/lib/libkiconv/kiconv_sysctl.c +++ b/lib/libkiconv/kiconv_sysctl.c @@ -59,6 +59,7 @@ kiconv_lookupconv(const char *drvname) free(drivers); return (0); } + free(drivers); } return (ENOENT); } @@ -86,6 +87,7 @@ kiconv_lookupcs(const char *tocode, const char *fromcode) return (0); } } + free(csi); } return (ENOENT); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104280012.13S0CAQo021452>