don't crash, if airpcap.dll isn't available
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 7 Oct 2006 22:41:17 +0000 (22:41 +0000)
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 7 Oct 2006 22:41:17 +0000 (22:41 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19448 f5534014-38df-0310-8fa8-9805f1628bb7

airpcap_loader.c

index 92eb5f9cc464fd788055f240eac28a95540a7f49..d65b06904ba1b5e1c642c908edf55d9cd489b72b 100644 (file)
@@ -385,13 +385,19 @@ get_airpcap_interface_list(int *err, char *err_str)
        GList  *il = NULL;
        airpcap_if_info_t *if_info;
        int i, n_adapts;
-    AirpcapDeviceDescription *devsList, *adListEntry;
+       AirpcapDeviceDescription *devsList, *adListEntry;
+
+       if(g_PAirpcapGetDeviceList == NULL) {
+               /* Airpcap.dll not available */
+               *err = NO_AIRPCAP_INTERFACES_FOUND;
+               return NULL;
+       }
 
        if(!g_PAirpcapGetDeviceList(&devsList, err_str))
        {
-               /* No interfaces, return il = NULL; */
+               /* No interfaces */
                *err = NO_AIRPCAP_INTERFACES_FOUND;
-               return il;
+               return NULL;
        }
 
        /*