--- vendor.c    6 Mar 2003 20:25:58 -0000       2.8
+++ vendor.c    13 Mar 2003 11:07:43 -0000      2.9
@@ -312,14 +312,15 @@
 #endif

   data_data = gdbm_fetch(myGlobals.macPrefixFile, key_data);
-
-  if ( (data_data.dptr != NULL) &&
-       ( (special == TRUE)  && ( ((MACInfo*)data_data.dptr)->isSpecial =
's') ) ||
-       ( (special == FALSE) && ( ((MACInfo*)data_data.dptr)->isSpecial !=
's') ) ) {
+
+  if(data_data.dptr != NULL) {
+    if(((special == TRUE)  && (((MACInfo*)data_data.dptr)->isSpecial =
's')) ||
+       ((special == FALSE) && (((MACInfo*)data_data.dptr)->isSpecial !=
's'))) {
       strncpy(tmpBuf, ((MACInfo*)data_data.dptr)->vendorName,
sizeof(tmpBuf));
       free(data_data.dptr);
       myGlobals.numVendorLookupFound24bit++;
       return(tmpBuf);
+    }
   }

   /* Hand coded for LAA/Multicast */

Thanks for finding it.  But I'm curious (for the future) - which OS doesn't
do short-cut evaluations?

-----Burton

-----Original Message-----
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Behalf
Of [EMAIL PROTECTED]
Sent: Thursday, March 13, 2003 5:08 AM
To: [EMAIL PROTECTED]
Subject: [Ntop-dev] New ntop commit (author deri)


Update of /export/home/ntop/ntop
In directory jabber:/tmp/cvs-serv16243

Modified Files:
        vendor.c
Log Message:
Little fix to avoid a core


_______________________________________________
Ntop-dev mailing list
[EMAIL PROTECTED]
http://listgateway.unipi.it/mailman/listinfo/ntop-dev

_______________________________________________
Ntop-dev mailing list
[EMAIL PROTECTED]
http://listgateway.unipi.it/mailman/listinfo/ntop-dev

Reply via email to