提交 c4dc95d3 authored 作者: Andrey Volk's avatar Andrey Volk 提交者: Mike Jerris

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

Conflicts:
	libs/sofia-sip/.update
上级 616490e9
Mon Jan 15 01:37:50 EST 2018 Wed Feb 21 15:29:04 CST 2018
...@@ -1059,7 +1059,9 @@ int tport_register_secondary(tport_t *self, su_wakeup_f wakeup, int events) ...@@ -1059,7 +1059,9 @@ int tport_register_secondary(tport_t *self, su_wakeup_f wakeup, int events)
self->tp_index = i; self->tp_index = i;
self->tp_events = events; 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; return 0;
} }
...@@ -2627,7 +2629,9 @@ int tport_accept(tport_primary_t *pri, int events) ...@@ -2627,7 +2629,9 @@ int tport_accept(tport_primary_t *pri, int events)
SU_CANONIZE_SOCKADDR(su); 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 tport_setname(self, pri->pri_protoname, ai, NULL) != -1
/* Register this secondary */ /* Register this secondary */
&& &&
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论