From owner-svn-src-projects@freebsd.org Sun Aug 9 12:13:31 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B95099D997 for ; Sun, 9 Aug 2015 12:13:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79E55919; Sun, 9 Aug 2015 12:13:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t79CDVfB007419; Sun, 9 Aug 2015 12:13:31 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t79CDVvv007417; Sun, 9 Aug 2015 12:13:31 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201508091213.t79CDVvv007417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 9 Aug 2015 12:13:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r286522 - projects/collation/lib/libc/locale X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Aug 2015 12:13:31 -0000 Author: bapt Date: Sun Aug 9 12:13:30 2015 New Revision: 286522 URL: https://svnweb.freebsd.org/changeset/base/286522 Log: Use more asprintf Plug memory leak introduced in previous asprintf addition Modified: projects/collation/lib/libc/locale/collate.c projects/collation/lib/libc/locale/setrunelocale.c Modified: projects/collation/lib/libc/locale/collate.c ============================================================================== --- projects/collation/lib/libc/locale/collate.c Sun Aug 9 11:50:50 2015 (r286521) +++ projects/collation/lib/libc/locale/collate.c Sun Aug 9 12:13:30 2015 (r286522) @@ -124,8 +124,10 @@ __collate_load_tables_l(const char *enco if (buf == NULL) return (_LDP_ERROR); - if ((fd = _open(buf, O_RDONLY)) < 0) + if ((fd = _open(buf, O_RDONLY)) < 0) { + free(buf); return (_LDP_ERROR); + } free(buf); if (_fstat(fd, &sbuf) < 0) { (void) _close(fd); Modified: projects/collation/lib/libc/locale/setrunelocale.c ============================================================================== --- projects/collation/lib/libc/locale/setrunelocale.c Sun Aug 9 11:50:50 2015 (r286521) +++ projects/collation/lib/libc/locale/setrunelocale.c Sun Aug 9 12:13:30 2015 (r286522) @@ -97,7 +97,7 @@ __setrunelocale(struct xlocale_ctype *l, { _RuneLocale *rl; int ret; - char path[PATH_MAX]; + char *path; struct xlocale_ctype saved = *l; /* @@ -110,13 +110,16 @@ __setrunelocale(struct xlocale_ctype *l, } /* Range checking not needed, encoding length already checked before */ - (void) snprintf(path, sizeof (path), "%s/%s/LC_CTYPE", - _PathLocale, encoding); + asprintf(&path, "%s/%s/LC_CTYPE", _PathLocale, encoding); + if (path == NULL) + return (0); if ((rl = _Read_RuneMagi(path)) == NULL) { + free(path); errno = EINVAL; return (errno); } + free(path); l->__mbrtowc = NULL; l->__mbsinit = NULL;