Received: by mail.netbsd.org (Postfix, from userid 605) id 702D984D8B; Wed, 20 Feb 2019 14:44:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ED60E84D58 for ; Wed, 20 Feb 2019 14:44:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id bk6txCtjgwjs for ; Wed, 20 Feb 2019 14:44:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4A3AA84D3A for ; Wed, 20 Feb 2019 14:44:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4430BFB16; Wed, 20 Feb 2019 14:44:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155067386425480" MIME-Version: 1.0 Date: Wed, 20 Feb 2019 09:44:24 -0500 From: "Christos Zoulas" Subject: CVS commit: pkgsrc/pkgtools/libnbcompat/files To: pkgsrc-changes@NetBSD.org Reply-To: christos@netbsd.org X-Mailer: log_accum Message-Id: <20190220144424.4430BFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_155067386425480 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: christos Date: Wed Feb 20 14:44:24 UTC 2019 Modified Files: pkgsrc/pkgtools/libnbcompat/files: __glob13.c Log Message: PR/52982: Eitan Adler: fix incorrect bounds computation. XXX: really we need to sync with the libc glob.c To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/libnbcompat/files/__glob13.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155067386425480 Content-Disposition: inline Content-Length: 1205 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/libnbcompat/files/__glob13.c diff -u pkgsrc/pkgtools/libnbcompat/files/__glob13.c:1.4 pkgsrc/pkgtools/libnbcompat/files/__glob13.c:1.5 --- pkgsrc/pkgtools/libnbcompat/files/__glob13.c:1.4 Fri Mar 14 18:08:17 2014 +++ pkgsrc/pkgtools/libnbcompat/files/__glob13.c Wed Feb 20 09:44:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: __glob13.c,v 1.4 2014/03/14 22:08:17 ryoon Exp $ */ +/* $NetBSD: __glob13.c,v 1.5 2019/02/20 14:44:24 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #else -__RCSID("$NetBSD: __glob13.c,v 1.4 2014/03/14 22:08:17 ryoon Exp $"); +__RCSID("$NetBSD: __glob13.c,v 1.5 2019/02/20 14:44:24 christos Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -594,8 +594,9 @@ glob1(pattern, pglob, limit) * we save one character so that we can use ptr >= limit, * in the general case when we are appending non nul chars only. */ - return(glob2(pathbuf, pathbuf, pathbuf + sizeof(pathbuf) - 1, pattern, - pglob, limit)); + return glob2(pathbuf, pathbuf, + pathbuf + (sizeof(pathbuf) / sizeof(*pathbuf)) - 1, pattern, + pglob, limit); } /* --_----------=_155067386425480--