[GNUnet-SVN] [libmicrohttpd] branch master updated: fix where we call gnutls_session_set_ptr to prevent NPE (#5427)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new 66c9ad84 fix where we call gnutls_session_set_ptr to prevent NPE 
(#5427)
66c9ad84 is described below

commit 66c9ad84dbe0dd411c584a3587cf2c080e5e9143
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Aug 18 10:59:46 2018 +0200

    fix where we call gnutls_session_set_ptr to prevent NPE (#5427)
---
 src/microhttpd/daemon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 31ed1574..2cbd90fd 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2430,6 +2430,8 @@ internal_add_connection (struct MHD_Daemon *daemon,
                   );
       gnutls_priority_set (connection->tls_session,
                           daemon->priority_cache);
+      gnutls_session_set_ptr (connection->tls_session,
+                             connection);
       switch (daemon->cred_type)
         {
           /* set needed credentials for certificate authentication. */
@@ -2481,8 +2483,6 @@ internal_add_connection (struct MHD_Daemon *daemon,
       goto cleanup;
 #endif /* ! HTTPS_SUPPORT */
     }
-  gnutls_session_set_ptr (connection->tls_session,
-                         connection);
 
   MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
   /* Firm check under lock. */

-- 
To stop receiving notification emails like this one, please contact
address@hidden