From 25cd668ca7110128bf9c4bc0e165ff6677a209b6 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Fri, 1 May 2015 11:00:16 +0000 Subject: [PATCH] Fixed null pointer seg fault in cmp function. FossilOrigin-Name: d0d1763f670212506f67155c605b0d693ba79c9b3ab51cd669e1495aa2a10978 --- src/capwap/action.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/capwap/action.c b/src/capwap/action.c index 7ca29f50..b1a6b14f 100644 --- a/src/capwap/action.c +++ b/src/capwap/action.c @@ -149,7 +149,20 @@ static int cw_action_out_cmp(const void *elem1, const void *elem2) if (r != 0) return r; - r = strcmp(e1->item_id, e2->item_id); + if (!e1->item_id && !e2->item_id){ + r=0; + } + else{ + if (!e1->item_id) { + r = strcmp("", e2->item_id); + } + else if (!e2->item_id){ + r = strcmp(e1->item_id,""); + } + else{ + r = strcmp(e1->item_id, e2->item_id); + } + } if (r != 0) return r;