Continue phase 2 of modules stuff.

[citadel.git] / citadel / modules / vcard / serv_vcard.c

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index ba292dfebbfff248efae9d45c2ee31f8767401b9..06b06371871da1eeaae74635dc32e53c17030f36 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -62,9 +62,8 @@
 #include "tools.h"
 #include "mime_parser.h"
 #include "vcard.h"
-#include "serv_ldap.h"
 #include "serv_vcard.h"
-
+#include "serv_ldap.h"
 
 #include "ctdl_module.h"
 
@@ -882,6 +881,8 @@ void vcard_delete_remove(char *room, long msgnum) {
        int linelen;
 
        if (msgnum <= 0L) return;
+       
+       if (room == NULL) return;
 
        if (strcasecmp(room, ADDRESS_BOOK_ROOM)) {
                return;