Date: Fri, 28 Jun 2002 23:00:02 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13571 for review Message-ID: <200206290600.g5T602bm005126@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13571 Change 13571 by peter@peter_daintree on 2002/06/28 23:00:00 IFC @13570 - missed a heap of stuff last time. (needed p4 integ -i) Affected files ... .. //depot/projects/ia64/bin/cat/cat.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-arm.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/gdbserve.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/linux.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-aix.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-eabi.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-sim.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-aix.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-nbsd.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sim.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sol2.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparc-em.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclet.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclite.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-nbsd.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparc.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclet.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclite.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-spc-em.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/vxsparc.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-nbsd.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#3 integrate .. //depot/projects/ia64/usr.bin/csplit/csplit.c#4 integrate Differences ... ==== //depot/projects/ia64/bin/cat/cat.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/cat/cat.c,v 1.24 2002/06/14 09:54:48 jmallett Exp $"; + "$FreeBSD: src/bin/cat/cat.c,v 1.25 2002/06/29 04:52:33 tjr Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -278,8 +278,11 @@ fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd >= 0) { sou.sun_family = AF_UNIX; - snprintf(sou.sun_path, sizeof(sou.sun_path), "%s", path); - len = strlen(sou.sun_path); + if ((len = strlcpy(sou.sun_path, path, + sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) { + errno = ENAMETOOLONG; + return (-1); + } len = offsetof(struct sockaddr_un, sun_path[len+1]); if (connect(fd, (void *)&sou, len) < 0) { ==== //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-arm.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mh#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/gdbserve.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/linux.mh#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-aix.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-eabi.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-sim.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-aix.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-linux.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mh#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mh#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mt#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-linux.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-nbsd.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sim.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sol2.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparc-em.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclet.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclite.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mh#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mh#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mh#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-linux.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-nbsd.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparc.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclet.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclite.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-spc-em.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/vxsparc.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-linux.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-nbsd.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#3 (text+ko) ==== ==== //depot/projects/ia64/usr.bin/csplit/csplit.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.4 2002/06/07 01:04:24 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.5 2002/06/29 05:31:26 tjr Exp $"); #include <sys/types.h> @@ -227,8 +227,11 @@ { FILE *fp; - snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, (int)sufflen, - nfiles); + if (snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, + (int)sufflen, nfiles) >= sizeof(currfile)) { + errno = ENAMETOOLONG; + err(1, NULL); + } if ((fp = fopen(currfile, "w+")) == NULL) err(1, "%s", currfile); nfiles++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206290600.g5T602bm005126>