fixing 1766

2 files changed, 24 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e2a970e..44ef5322 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 14 13:43:26 CEST 2011
+        Fixing minor memory leak if daemon with HTTPS support failed to
+        initialize (#1766). -CG
+
 Tue Sep 13 09:47:58 CEST 2011
         Try to release responses more promptly upon connection termination. -CG
 
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index c23a4327..b0aca594 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -2005,6 +2005,10 @@ MHD_start_daemon_va (unsigned int options,
 
   if (MHD_YES != parse_options_va (retVal, &servaddr, ap))
     {
+#if HTTPS_SUPPORT
+      if (options & MHD_USE_SSL)
+        gnutls_priority_deinit (retVal->priority_cache);
+#endif
       free (retVal);
       return NULL;
     }
@@ -2019,6 +2023,10 @@ MHD_start_daemon_va (unsigned int options,
           MHD_DLOG (retVal,
                     "Specified value for NC_SIZE too large\n");
 #endif
+#if HTTPS_SUPPORT
+          if (options & MHD_USE_SSL)
+            gnutls_priority_deinit (retVal->priority_cache);
+#endif
           free (retVal);
           return NULL;    
         }
@@ -2030,6 +2038,10 @@ MHD_start_daemon_va (unsigned int options,
                         "Failed to allocate memory for nonce-nc map: %s\n",
                         STRERROR (errno));
 #endif
+#if HTTPS_SUPPORT
+              if (options & MHD_USE_SSL)
+                gnutls_priority_deinit (retVal->priority_cache);
+#endif
               free (retVal);
               return NULL;
             }
@@ -2041,6 +2053,10 @@ MHD_start_daemon_va (unsigned int options,
       MHD_DLOG (retVal,
                 "MHD failed to initialize nonce-nc mutex\n");
 #endif
+#if HTTPS_SUPPORT
+      if (options & MHD_USE_SSL)
+        gnutls_priority_deinit (retVal->priority_cache);
+#endif
       free (retVal->nnc);
       free (retVal);
       return NULL;
@@ -2362,6 +2378,10 @@ thread_failed:
   free (retVal->nnc);
   pthread_mutex_destroy (&retVal->nnc_lock);
 #endif
+#if HTTPS_SUPPORT
+  if (options & MHD_USE_SSL)
+    gnutls_priority_deinit (retVal->priority_cache);
+#endif
   free (retVal);
   return NULL;
 }