# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1179391441 -7200
# Node ID 75aee46d3aee83b13d43171b8877792d46bb013b
# Parent  0dd5df7eb007e07327a05e7a6706d53eff7cef6c
Fix a problem with the ssl_ca{file,path} variables expansion

diff -r 0dd5df7eb007 -r 75aee46d3aee mcabber/src/main.c
--- a/mcabber/src/main.c	Thu May 10 13:22:31 2007 +0200
+++ b/mcabber/src/main.c	Thu May 17 10:44:01 2007 +0200
@@ -71,7 +71,7 @@
   int ssl;
   int sslverify = -1;
   const char *sslvopt = NULL, *cafile = NULL, *capath = NULL, *ciphers = NULL;
-  char *cafile_xp = NULL, *capath_xp = NULL;
+  static char *cafile_xp, *capath_xp;
   unsigned int port;
 
   servername = settings_opt_get("server");
@@ -80,6 +80,11 @@
   resource   = settings_opt_get("resource");
   proxy_host = settings_opt_get("proxy_host");
 
+  // Free the ca*_xp strings if they've already been set.
+  g_free(cafile_xp);
+  g_free(capath_xp);
+  cafile_xp = capath_xp = NULL;
+
   if (!servername) {
     scr_LogPrint(LPRINT_NORMAL, "Server name has not been specified!");
     return;
@@ -113,11 +118,11 @@
     cafile = capath = ciphers = NULL;
   }
 #endif
-  if (cafile)   cafile_xp = expand_filename(cafile);
-  if (capath)   capath_xp = expand_filename(capath);
+  cafile_xp = expand_filename(cafile);
+  capath_xp = expand_filename(capath);
   cw_set_ssl_options(sslverify, cafile_xp, capath_xp, ciphers, servername);
-  g_free(cafile_xp);
-  g_free(capath_xp);
+  // We can't free the ca*_xp variables now, because they're not duplicated
+  // in cw_set_ssl_options().
 
   /* Connect to server */
   scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, "Connecting to server: %s",
diff -r 0dd5df7eb007 -r 75aee46d3aee mcabber/src/utils.c
--- a/mcabber/src/utils.c	Thu May 10 13:22:31 2007 +0200
+++ b/mcabber/src/utils.c	Thu May 17 10:44:01 2007 +0200
@@ -50,6 +50,8 @@
 // The caller must free the string after use.
 char *expand_filename(const char *fname)
 {
+  if (!fname)
+    return NULL;
   if (!strncmp(fname, "~/", 2)) {
     char *homedir = getenv("HOME");
     if (homedir)