Clear subscriptions before calling close handler, not after

This commit is contained in:
Alex Hultman
2021-11-13 09:23:09 +01:00
parent 01d16b3ce8
commit 9a5bc5d09c
2 changed files with 8 additions and 8 deletions
+4 -4
View File
@@ -258,13 +258,13 @@ private:
/* Emit close event */
auto *webSocketContextData = (WebSocketContextData<SSL, USERDATA> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s));
if (webSocketContextData->closeHandler) {
webSocketContextData->closeHandler((WebSocket<SSL, isServer, USERDATA> *) s, 1006, {(char *) reason, (size_t) code});
}
/* Make sure to unsubscribe from any pub/sub node at exit */
webSocketContextData->topicTree->freeSubscriber(webSocketData->subscriber);
webSocketData->subscriber = nullptr;
if (webSocketContextData->closeHandler) {
webSocketContextData->closeHandler((WebSocket<SSL, isServer, USERDATA> *) s, 1006, {(char *) reason, (size_t) code});
}
}
/* Destruct in-placed data struct */