CtdlUnregisterRoomHook(): fix possible nullpointer deref

[citadel.git] / citadel / serv_extensions.c

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 9100daea3509c914b2df4a8670de418b146b9bda..fe15aa785c438b781448f368bc314e97458d4c2a 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -409,7 +409,7 @@ void cmd_log_get(char *argbuf)
 
        while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
                LogDebugEntry *E = (LogDebugEntry*)vptr;
-               cprintf("%s: %d\n", ch, *E->LogP);
+               cprintf("%s|%d\n", ch, *E->LogP);
        }
        
        DeleteHashPos(&Pos);
@@ -757,18 +757,25 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 
 void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 {
-       RoomFunctionHook *cur, *p;
+       RoomFunctionHook *cur, *p, *last;
 
-       for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
-               while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
+       for (last = NULL, cur = RoomHookTable;
+            cur != NULL;
+            cur = cur->next)
+       {
+               if (fcn_ptr == cur->fcn_ptr) {
                        MODM_syslog(LOG_DEBUG, "Unregistered room function\n");
                        p = cur->next;
-                       if (cur == RoomHookTable) {
-                               RoomHookTable = p;
-                       }
+
                        free(cur);
-                       cur = p;
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               RoomHookTable = p;
                }
+               last = cur;
        }
 }