Jabber now reads the context list safely and it writes it safely too.

[citadel.git] / citadel / modules / jabber / xmpp_query_namespace.c

diff --git a/citadel/modules/jabber/xmpp_query_namespace.c b/citadel/modules/jabber/xmpp_query_namespace.c
index fdec3135fe639a19703ae8dfbd3bab2aa9c7ee16..98f62285a1216989c3090a6e7ffcaee99f3e87a9 100644 (file)
--- a/citadel/modules/jabber/xmpp_query_namespace.c
+++ b/citadel/modules/jabber/xmpp_query_namespace.c
@@ -70,21 +70,26 @@ void jabber_roster_item(struct CitContext *cptr) {
 void jabber_iq_roster_query(void)
 {
        struct CitContext *cptr;
+       int nContexts, i;
        int aide = (CC->user.axlevel >= 6);
 
        cprintf("<query xmlns=\"jabber:iq:roster\">");
 
-       for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
-               if (cptr->logged_in) {
+       cptr = CtdlGetContextArray(&nContexts);
+       if (!cptr)
+               return ; /** FIXME: Does jabber need to send something to maintain the protocol?  */
+               
+       for (i=0; i<nContexts; i++) {
+               if (cptr[i].logged_in) {
                        if (
-                          (((cptr->cs_flags&CS_STEALTH)==0) || (aide))
-                          && (cptr->user.usernum != CC->user.usernum)
+                          (((cptr[i].cs_flags&CS_STEALTH)==0) || (aide))
+                          && (cptr[i].user.usernum != CC->user.usernum)
                           ) {
-                               jabber_roster_item(cptr);
+                               jabber_roster_item(&cptr[i]);
                        }
                }
        }
-
+       free (cptr);
        cprintf("</query>");
 }