Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
d5355ff
..
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;
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;
*prv = s->next;
- afb_session_
add
ref(s->session);
+ afb_session_
un
ref(s->session);
free(s);
}
free(s);
}
+ else
+ prv = &s->next;
}
/* create */
}
/* create */
@@
-533,6
+533,8
@@
static void on_call(void *closure, struct afb_proto_ws_call *call, const char *v
goto unconnected;
wreq->xreq.context.validated = 1;
record_session(stubws, wreq->xreq.context.session);
goto unconnected;
wreq->xreq.context.validated = 1;
record_session(stubws, wreq->xreq.context.session);
+ if (wreq->xreq.context.created)
+ afb_session_set_autoclose(wreq->xreq.context.session, 1);
/* makes the call */
wreq->xreq.cred = afb_cred_addref(stubws->cred);
/* makes the call */
wreq->xreq.cred = afb_cred_addref(stubws->cred);
@@
-649,10
+651,12
@@
static void on_hangup(void *closure)
{
struct afb_stub_ws *stubws = closure;
{
struct afb_stub_ws *stubws = closure;
+ afb_stub_ws_addref(stubws);
if (stubws->on_hangup)
stubws->on_hangup(stubws);
release_sessions(stubws);
if (stubws->on_hangup)
stubws->on_hangup(stubws);
release_sessions(stubws);
+ afb_stub_ws_unref(stubws);
}
/*****************************************************/
}
/*****************************************************/