From: Vincent JARDIN <vincent.jardin@6wind.com>
Date: Mon, 9 Oct 2017 08:51:03 +0000 (+0200)
Subject: lib: linklist avoid access NULL->data
X-Git-Tag: frr-4.0-dev~230^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=67533c11d2069bcf65a08a84e26fba900448f4ea;p=matthieu%2Ffrr.git

lib: linklist avoid access NULL->data

Let's assert(NULL) if the datastructure is not set.
The code assumes that the pointer is always non NULL. So, let's enforce
this semantic.

Signed-off-by: Vincent Jardin <vincent.jardin@6wind.com>
---

diff --git a/lib/linklist.h b/lib/linklist.h
index 4a65fead86..8a43fbe64b 100644
--- a/lib/linklist.h
+++ b/lib/linklist.h
@@ -56,7 +56,8 @@ struct list {
 #define listtail(X) ((X) ? ((X)->tail) : NULL)
 #define listcount(X) ((X)->count)
 #define list_isempty(X) ((X)->head == NULL && (X)->tail == NULL)
-#define listgetdata(X) (assert((X)->data != NULL), (X)->data)
+/* return X->data only if X and X->data are not NULL */
+#define listgetdata(X) (assert(X), assert((X)->data != NULL), (X)->data)
 
 /* Prototypes. */
 extern struct list *