afb-stub-ws: Protect against self-destruction

[src/app-framework-binder.git] / src / afb-stub-ws.c

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index 48ce9e0..a8af53c 100644 (file)
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -481,13 +481,13 @@ static void record_session(struct afb_stub_ws *stubws, struct afb_session *sessi
        while ((s = *prv)) {
                if (s->session == session)
                        return;
-               if (afb_session_is_active(s->session))
-                       prv = &s->next;
-               else {
+               if (afb_session_is_closed(s->session)) {
                        *prv = s->next;
                        afb_session_unref(s->session);
                        free(s);
                }
+               else
+                       prv = &s->next;
        }
 
        /* create */
@@ -651,10 +651,12 @@ static void on_hangup(void *closure)
 {
        struct afb_stub_ws *stubws = closure;
 
+       afb_stub_ws_addref(stubws);
        if (stubws->on_hangup)
                stubws->on_hangup(stubws);
 
        release_sessions(stubws);
+       afb_stub_ws_unref(stubws);
 }
 
 /*****************************************************/