svn commit: r231560 - stable/9/usr.bin/rpcgen

[Dimitry Andric]

Author: dim
Date: Sun Feb 12 14:56:31 2012
New Revision: 231560
URL: http://svn.freebsd.org/changeset/base/231560

Log:
  MFC r231054:
  
  In usr.bin/rpcgen/rpc_main.c, properly check the return value of
  strlcpy(), in addition to checking that of strlcat().

Modified:
  stable/9/usr.bin/rpcgen/rpc_main.c
Directory Properties:
  stable/9/usr.bin/rpcgen/   (props changed)

Modified: stable/9/usr.bin/rpcgen/rpc_main.c
==============================================================================
--- stable/9/usr.bin/rpcgen/rpc_main.c	Sun Feb 12 14:55:27 2012	(r231559)
+++ stable/9/usr.bin/rpcgen/rpc_main.c	Sun Feb 12 14:56:31 2012	(r231560)
@@ -1129,9 +1129,11 @@ parseargs(int argc, const char *argv[], 
 					if (++i == argc) {
 						return (0);
 					}
-					(void) strlcpy(pathbuf, argv[i], sizeof(pathbuf));
-					if (strlcat(pathbuf, "/cpp", sizeof(pathbuf))
-					    >= sizeof(pathbuf)) {
+					if (strlcpy(pathbuf, argv[i],
+					    sizeof(pathbuf)) >= sizeof(pathbuf)
+					    || strlcat(pathbuf, "/cpp",
+					    sizeof(pathbuf)) >=
+					    sizeof(pathbuf)) {
 						warnx("argument too long");
 						return (0);
 					}