From owner-p4-projects@FreeBSD.ORG  Sat Mar 11 02:12:11 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6B20F16B0BF; Sat, 11 Mar 2006 02:12:01 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 08E4A16B0D4
	for <perforce@freebsd.org>; Sat, 11 Mar 2006 02:11:53 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 691E545277
	for <perforce@freebsd.org>; Fri, 10 Mar 2006 14:05:31 +0000 (GMT)
	(envelope-from soc-bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2AE5VQF002625
	for <perforce@freebsd.org>; Fri, 10 Mar 2006 14:05:31 GMT
	(envelope-from soc-bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2AE5PiQ002618
	for perforce@freebsd.org; Fri, 10 Mar 2006 14:05:25 GMT
	(envelope-from soc-bushman@freebsd.org)
Date: Fri, 10 Mar 2006 14:05:25 GMT
Message-Id: <200603101405.k2AE5PiQ002618@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-bushman@freebsd.org using -f
From: soc-bushman <soc-bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93108 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Mar 2006 02:12:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=93108

Change 93108 by soc-bushman@soc-bushman_stinger on 2006/03/10 14:04:21

	a bug in the addrinfo_marshal function, that caused crashes when compiled with INET6 defined

Affected files ...

.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#9 edit

Differences ...

==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#9 (text+ko) ====

@@ -1645,7 +1645,7 @@
 	for (cai = ai; cai != NULL; cai = cai->ai_next) {
 		desired_size += sizeof(struct addrinfo) + cai->ai_addrlen;
 		if (cai->ai_canonname != NULL)
-			desired_size += strlen(cai->ai_canonname);
+			desired_size += sizeof(size_t) + strlen(cai->ai_canonname);
 		++ai_size;
 	}
 	
@@ -1674,7 +1674,7 @@
 			p += sizeof(size_t);
 			
 			memcpy(p, cai->ai_canonname, size);
-			p += size + 1;
+			p += size;
 		}
 	}