pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files PR/52982: Eitan Adler: fix ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/230fbd6634f2
branches:  trunk
changeset: 329990:230fbd6634f2
user:      christos <christos%pkgsrc.org@localhost>
date:      Wed Feb 20 14:44:24 2019 +0000

description:
PR/52982: Eitan Adler: fix incorrect bounds computation.
XXX: really we need to sync with the libc glob.c

diffstat:

 pkgtools/libnbcompat/files/__glob13.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r b9016e9124da -r 230fbd6634f2 pkgtools/libnbcompat/files/__glob13.c
--- a/pkgtools/libnbcompat/files/__glob13.c     Wed Feb 20 13:29:43 2019 +0000
+++ b/pkgtools/libnbcompat/files/__glob13.c     Wed Feb 20 14:44:24 2019 +0000
@@ -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 @@
         * 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);
 }
 
 /*



Home | Main Index | Thread Index | Old Index