From: Christian Franke <chris@opensourcerouting.org>
Date: Sat, 10 Nov 2018 15:14:40 +0000 (+0100)
Subject: isisd: Fix lsp_build_list_nonzero_ht
X-Git-Tag: frr-7.1-dev~214^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9337256ebf9e562d30bd03bfa02e37f3158b5ef6;p=mirror%2Ffrr.git

isisd: Fix lsp_build_list_nonzero_ht

When `first` would be initialized to the same value as `last`, the
function would return incorrect results.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index bb090f42ed..5b34bb37db 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -578,29 +578,17 @@ void lsp_insert(struct isis_lsp *lsp, dict_t *lspdb)
 void lsp_build_list_nonzero_ht(uint8_t *start_id, uint8_t *stop_id,
 			       struct list *list, dict_t *lspdb)
 {
-	dnode_t *first, *last, *curr;
+	for (dnode_t *curr = dict_lower_bound(lspdb, start_id);
+	     curr; curr = dict_next(lspdb, curr)) {
+		struct isis_lsp *lsp = curr->dict_data;
 
-	first = dict_lower_bound(lspdb, start_id);
-	if (!first)
-		return;
-
-	last = dict_upper_bound(lspdb, stop_id);
-
-	curr = first;
-
-	if (((struct isis_lsp *)(curr->dict_data))->hdr.rem_lifetime)
-		listnode_add(list, first->dict_data);
-
-	while (curr) {
-		curr = dict_next(lspdb, curr);
-		if (curr
-		    && ((struct isis_lsp *)(curr->dict_data))->hdr.rem_lifetime)
-			listnode_add(list, curr->dict_data);
-		if (curr == last)
+		if (memcmp(lsp->hdr.lsp_id, stop_id,
+			   ISIS_SYS_ID_LEN + 2) > 0)
 			break;
-	}
 
-	return;
+		if (lsp->hdr.rem_lifetime)
+			listnode_add(list, lsp);
+	}
 }
 
 static void lsp_set_time(struct isis_lsp *lsp)