FS-9753: [mod_sofia] Fix crash when accessing the WSS interface via regular HTTPS

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 5b7da58dcfc478dc095b0243ae8e723c27b744f6..0b779c7ab1d8bcb1bf792c767b7ea1b92dfe4a41 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Mon Jun 26 14:53:11 CDT 2017
+Wed Feb 21 13:55:11 CDT 2018

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport.c
index 29e5cb0399bc57996dd3180058f14c8030339058..286de1a91e21149d77ee38c3956dfda2871186aa 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/tport/tport.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport.c
@@ -1059,7 +1059,9 @@ int tport_register_secondary(tport_t *self, su_wakeup_f wakeup, int events)
     self->tp_index = i;
     self->tp_events = events;
 
-    tprb_append(&self->tp_pri->pri_open, self);
+       /* Can't be added to list of opened if already closed */
+       if (!tport_is_closed(self))
+               tprb_append(&self->tp_pri->pri_open, self);
     return 0;
   }
 
@@ -2627,7 +2629,9 @@ int tport_accept(tport_primary_t *pri, int events)
 
     SU_CANONIZE_SOCKADDR(su);
 
-    if (/* Name this transport */
+    if (/* Prevent being marked as connected if already closed */
+               !tport_is_closed(self) && 
+               /* Name this transport */
         tport_setname(self, pri->pri_protoname, ai, NULL) != -1 
        /* Register this secondary */ 
        &&