dhcp4: set underflow in dnssearch when EOF unexpected

openSUSE · Jul 1, 2015 · e6bb6f3 · e6bb6f3
1 parent fd2d23f
commit e6bb6f3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/dhcp4/protocol.c b/dhcp4/protocol.c
@@ -1137,8 +1137,10 @@ ni_dhcp4_decode_dnssearch(ni_buffer_t *optbuf, ni_string_array_t *list, const ch
 			char label[64];
 			int length;
 
-			if ((length = ni_buffer_getc(bp)) == EOF)
+			if ((length = ni_buffer_getc(bp)) == EOF) {
+				bp->underflow = 1;
 				goto failure; /* unexpected EOF */
+			}
 
 			if (length == 0)
 				break;	/* end of this name */
@@ -1158,8 +1160,10 @@ ni_dhcp4_decode_dnssearch(ni_buffer_t *optbuf, ni_string_array_t *list, const ch
 			case 0xC0:
 				/* Pointer */
 				pointer = (length & 0x3F) << 8;
-				if ((length = ni_buffer_getc(bp)) == EOF)
+				if ((length = ni_buffer_getc(bp)) == EOF) {
+					bp->underflow = 1;
 					goto failure;
+				}
 
 				pointer |= length;
 				if (pointer >= pos)