From 3e4ee9591aa2d84f01ae478afd273ac55add0a1c Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Thu, 6 Aug 2009 12:08:50 +0100 Subject: lib: if_lookup_by_name should be more robust to null argument * if.c: (if_lookup_by_name) shouldn't crash just cause we got a NULL name --- lib/if.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/if.c b/lib/if.c index ecf9ff90..e3107116 100644 --- a/lib/if.c +++ b/lib/if.c @@ -205,7 +205,8 @@ ifname2ifindex (const char *name) { struct interface *ifp; - return ((ifp = if_lookup_by_name(name)) != NULL) ? ifp->ifindex : 0; + return ((ifp = if_lookup_by_name(name)) != NULL) ? ifp->ifindex + : IFINDEX_INTERNAL; } /* Interface existance check by interface name. */ @@ -214,12 +215,13 @@ if_lookup_by_name (const char *name) { struct listnode *node; struct interface *ifp; - - for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp)) - { - if (strcmp(name, ifp->name) == 0) - return ifp; - } + + if (name) + for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp)) + { + if (strcmp(name, ifp->name) == 0) + return ifp; + } return NULL; } -- cgit v1.2.1