Index: lib/libc/nameser/ns_name.c
===================================================================
--- lib/libc/nameser/ns_name.c
+++ lib/libc/nameser/ns_name.c
@@ -684,7 +684,7 @@
 {
 	const u_char *cp;
 	u_int n;
-	int l;
+	int l = 0;
 
 	cp = *ptrptr;
 	while (cp < eom && (n = *cp++) != 0) {
@@ -694,7 +694,7 @@
 			cp += n;
 			continue;
 		case NS_TYPE_ELT: /*%< EDNS0 extended label */
-			if ((l = labellen(cp - 1)) < 0) {
+			if (cp < eom && (l = labellen(cp - 1)) < 0) {
 				errno = EMSGSIZE; /*%< XXX */
 				return (-1);
 			}