From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 18 Jul 2010 16:08:21 +0000 (+0100)
Subject: Merge memory hygeine branch
X-Git-Tag: branchpoint-5.1~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/cdabf44d4bf72678b402c0fd7dac394eb36513da

Merge memory hygeine branch
---

cdabf44d4bf72678b402c0fd7dac394eb36513da
diff --cc lib/client.c
index 00727ef,50f7184..2cbcfa7
--- a/lib/client.c
+++ b/lib/client.c
@@@ -505,9 -515,11 +515,11 @@@ int disorder_close(disorder_client *c) 
      }
      c->fpout = 0;
    }
+   xfree(c->ident);
    c->ident = 0;
+   xfree(c->user);
    c->user = 0;
 -  return 0;
 +  return ret;
  }
  
  /** @brief Play a track
diff --cc lib/configuration.h
index 22e107d,f1794aa..8255db2
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@@ -326,8 -320,8 +326,10 @@@ char *config_usersysconf(const struct p
  char *config_private(void);
  /* get the private config file */
  
 +int config_verify(void);
 +
+ void config_free(struct config *c);
+ 
  extern char *configfile;
  extern int config_per_user;