From: Holger Hans Peter Freyther <[email protected]>
The dispatching might lead to the removal of more
paging requests and makes "request" invalid. Remove
it before calling the callback.
---
openbsc/src/libbsc/paging.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/openbsc/src/libbsc/paging.c b/openbsc/src/libbsc/paging.c
index 2d08af7..8bc10e6 100644
--- a/openbsc/src/libbsc/paging.c
+++ b/openbsc/src/libbsc/paging.c
@@ -366,13 +366,19 @@ static void _paging_request_stop(struct gsm_bts *bts,
struct gsm_subscriber *sub
llist_for_each_entry_safe(req, req2, &bts_entry->pending_requests,
entry) {
if (req->subscr == subscr) {
- if (conn && req->cbfn) {
+ gsm_cbfn *cbfn = req->cbfn;
+ void *param = req->cbfn_param;
+
+ /* now give up the data structure */
+ paging_remove_request(&bts->paging, req);
+ req = NULL;
+
+ if (conn && cbfn) {
LOGP(DPAG, LOGL_DEBUG, "Stop paging on bts %d,
calling cbfn.\n", bts->nr);
- req->cbfn(GSM_HOOK_RR_PAGING,
GSM_PAGING_SUCCEEDED,
- msg, conn, req->cbfn_param);
+ cbfn(GSM_HOOK_RR_PAGING, GSM_PAGING_SUCCEEDED,
+ msg, conn, param);
} else
LOGP(DPAG, LOGL_DEBUG, "Stop paging on bts %d
silently.\n", bts->nr);
- paging_remove_request(&bts->paging, req);
break;
}
}
--
2.1.4
