svn commit: r223679 - stable/7/contrib/traceroute

Dimitry Andric dim at FreeBSD.org
Wed Jun 29 16:46:12 UTC 2011


Author: dim
Date: Wed Jun 29 16:46:12 2011
New Revision: 223679
URL: http://svn.freebsd.org/changeset/base/223679

Log:
  MFC r223579:
  
  For some reason, contrib/traceroute/traceroute.c ensures MAXHOSTNAMELEN
  is defined, but then proceeds to use a hardcoded maximum hostname length
  of 64 anyway.  Fix this by checking against MAXHOSTNAMELEN instead.
  
  PR:	bin/157732

Modified:
  stable/7/contrib/traceroute/traceroute.c
Directory Properties:
  stable/7/contrib/traceroute/   (props changed)

Modified: stable/7/contrib/traceroute/traceroute.c
==============================================================================
--- stable/7/contrib/traceroute/traceroute.c	Wed Jun 29 16:43:44 2011	(r223678)
+++ stable/7/contrib/traceroute/traceroute.c	Wed Jun 29 16:46:12 2011	(r223679)
@@ -1625,7 +1625,7 @@ gethostinfo(register char *hostname)
 	register char **p;
 	register u_int32_t addr, *ap;
 
-	if (strlen(hostname) > 64) {
+	if (strlen(hostname) >= MAXHOSTNAMELEN) {
 		Fprintf(stderr, "%s: hostname \"%.32s...\" is too long\n",
 		    prog, hostname);
 		exit(1);


More information about the svn-src-all mailing list