NETCFG: cleanup & memleaks fixed.

[citadel.git] / citadel / modules / network / serv_netspool.c

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index ed79adb8b5316ea1c6a547abc37ccbfe6a8e0a86..b0928454c130aafb508bfe08c0141529654316a4 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -237,8 +237,8 @@ void CalcListID(SpoolControl *sc)
        if (fd != 0) {
                struct stat stbuf;
 
-               fstat(fd, &stbuf);
-               if (stbuf.st_size > 0)
+               if ((fstat(fd, &stbuf) == 0) &&
+                   (stbuf.st_size > 0))
                {
                        sc->RoomInfo = NewStrBufPlain(NULL, stbuf.st_size + 1);
                        StrBufReadBLOB(sc->RoomInfo, &fd, 0, stbuf.st_size, &err);
@@ -1017,6 +1017,21 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
        closedir(dp);
 }
 
+void free_spoolcontrol_struct(SpoolControl **sc)
+{
+       free_spoolcontrol_struct_members(*sc);
+       free(*sc);
+       *sc = NULL;
+}
+
+void free_spoolcontrol_struct_members(SpoolControl *sc)
+{
+       int i;
+       FreeStrBuf(&sc->RoomInfo);
+       FreeStrBuf(&sc->ListID);
+       for (i = 0; i < maxRoomNetCfg; i++)
+               FreeStrBuf(&sc->Users[i]);
+}