CVS commit: pkgsrc/pkgtools/libnbcompat/files

["Christos Zoulas" <christos%netbsd.org@localhost>]

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.

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);
 }
 
 /*