Changeset 2148

Timestamp:

09/04/2008 22:08:28 (2 years ago)

Author:

chris

Message:

Fix crash when notifying sysadmin of an invalid event code.

Disable some debug logging.

Files:

• box/trunk/bin/bbackupd/BackupDaemon.cpp (modified) (1 diff)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -2361 +2361 @@
         };
 
-        BOX_TRACE("sizeof(sEventNames)  == " << sizeof(sEventNames));
-        BOX_TRACE("sizeof(*sEventNames) == " << sizeof(*sEventNames));
-        BOX_TRACE("NotifyEvent__MAX == " << NotifyEvent__MAX);
+        // BOX_TRACE("sizeof(sEventNames)  == " << sizeof(sEventNames));
+        // BOX_TRACE("sizeof(*sEventNames) == " << sizeof(*sEventNames));
+        // BOX_TRACE("NotifyEvent__MAX == " << NotifyEvent__MAX);
         ASSERT((sizeof(sEventNames)/sizeof(*sEventNames)) == NotifyEvent__MAX + 1);
+
+        if(Event < 0 || Event >= NotifyEvent__MAX)
+        {
+                BOX_ERROR("BackupDaemon::NotifySysadmin() called for "
+                        "invalid event code " << Event);
+                THROW_EXCEPTION(BackupStoreException,
+                        BadNotifySysadminEventCode);
+        }
 
         BOX_TRACE("BackupDaemon::NotifySysadmin() called, event = " << 
                 sEventNames[Event]);
-
-        if(Event < 0 || Event >= NotifyEvent__MAX)
-        {
-                THROW_EXCEPTION(BackupStoreException,
-                        BadNotifySysadminEventCode);
-        }
 
         // Don't send lots of repeated messages