Adding upstream version 3.4.0.upstream/3.4.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 7 deletions

diff --git a/src/libknot/packet/wire.h b/src/libknot/packet/wire.h
index 630cd83..cff4b21 100644
--- a/src/libknot/packet/wire.h
+++ b/src/libknot/packet/wire.h
@@ -1025,13 +1025,11 @@ static inline uint16_t knot_wire_get_pointer(const uint8_t *pos)
 	return (knot_wire_read_u16(pos) - KNOT_WIRE_PTR_BASE);	// Return offset.
 }
 
-_pure_ _mustcheck_
+_pure_ _mustcheck_ _nonnull_(2)
 static inline const uint8_t *knot_wire_seek_label(const uint8_t *lp, const uint8_t *wire)
 {
+	assert(wire);
 	while (knot_wire_is_pointer(lp)) {
-		if (!wire) {
-			return NULL;
-		}
 		const uint8_t *new_lp = wire + knot_wire_get_pointer(lp);
 		if (new_lp >= lp) {
 			assert(0);
@@ -1042,12 +1040,21 @@ static inline const uint8_t *knot_wire_seek_label(const uint8_t *lp, const uint8
 	return lp;
 }
 
-_pure_ _mustcheck_
+_pure_ _mustcheck_ _nonnull_(1, 2)
 static inline const uint8_t *knot_wire_next_label(const uint8_t *lp, const uint8_t *wire)
 {
-	if (!lp || !lp[0]) /* No label after final label. */
-		return NULL;
+	assert(lp);
+	assert(lp[0] > 0); // Not a terminal label.
 	return knot_wire_seek_label(lp + (lp[0] + sizeof(uint8_t)), wire);
 }
 
+_pure_ _mustcheck_ _nonnull_(1)
+static inline const uint8_t *knot_dname_next_label(const uint8_t *lp)
+{
+	assert(lp);
+	assert(lp[0] > 0); // Not a terminal label.
+	assert(!knot_wire_is_pointer(lp));
+	return lp + (lp[0] + sizeof(uint8_t));
+}
+
 /*! @} */