From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Fri, 6 Nov 2015 16:36:37 +0000 (+0000)
Subject: Quagga crash in prefix_list_apply
X-Git-Tag: frr-2.0-rc1~1204^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=301d65c0ba61f677de55778d6b467d94b2e4f1d7;p=mirror%2Ffrr.git

Quagga crash in prefix_list_apply

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-8130
---

diff --git a/lib/plist.c b/lib/plist.c
index 63fd94c422..c974a75b90 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -743,7 +743,7 @@ prefix_list_apply (struct prefix_list *plist, void *object)
 
   struct prefix *p = (struct prefix *) object;
   uint8_t *byte = &p->u.prefix;
-  size_t depth = plist->master->trie_depth;
+  size_t depth;
   size_t validbits = p->prefixlen;
   struct pltrie_table *table;
 
@@ -753,6 +753,7 @@ prefix_list_apply (struct prefix_list *plist, void *object)
   if (plist->count == 0)
     return PREFIX_PERMIT;
 
+  depth = plist->master->trie_depth;
   table = plist->trie;
   while (1)
     {