From owner-p4-projects@FreeBSD.ORG  Fri Aug 10 10:03:15 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 684E016A41B; Fri, 10 Aug 2007 10:03:15 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 26EB416A417
	for <perforce@FreeBSD.org>; Fri, 10 Aug 2007 10:03:15 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 17EAB13C4A8
	for <perforce@FreeBSD.org>; Fri, 10 Aug 2007 10:03:15 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7AA3Emg098261
	for <perforce@FreeBSD.org>; Fri, 10 Aug 2007 10:03:14 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7AA3END098258
	for perforce@freebsd.org; Fri, 10 Aug 2007 10:03:14 GMT
	(envelope-from fli@FreeBSD.org)
Date: Fri, 10 Aug 2007 10:03:14 GMT
Message-Id: <200708101003.l7AA3END098258@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 124999 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: Fri, 10 Aug 2007 10:03:16 -0000

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

Change 124999 by fli@fli_nexus on 2007/08/10 10:02:55

	Do not assume that the name passed to name_compress() is properly
	dot-terminated (even though it should be).

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#8 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#8 (text+ko) ====

@@ -231,14 +231,15 @@
  */
 static int
 name_compress(struct hashtbl *ht, char *str, size_t slen, char *dst,
-	size_t *dlen, int pkg_offset)
+	    size_t *dlen, int pkg_offset)
+
 {
 	char *p, *q;
 	void *res;
 	int i;
 	uint16_t offset;
 
-	if (slen > *dlen)
+	if (slen >= *dlen)
 		return (-1);
 
 	p = str + slen - 1;
@@ -247,7 +248,14 @@
 	/*
 	 * Turn into a normal DNS label without compression.
 	 */
-	while (p != str) {
+	if (*p == '.')
+		p--;
+	else {
+		q++;
+		slen++;
+	}
+	*q-- = 0;
+	while (p != str && q != (dst + 1) ) {
 		if (*p == '.') {
 			*q = (char)i;
 			i = 0;