diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-08-30 19:07:58 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-08-31 01:16:01 +0200 |
commit | 0a527c9ee7f3497b49c64d1ba60bc4e4198a1158 (patch) | |
tree | 02283076120b798971fe8fb96045eb5baef06a59 /openbsc | |
parent | f192a6c4290a2da79ae1479397b0f58d444e8587 (diff) |
bsc: Fix a crash in case we get a NACK from the BTS for a new channel
In case of a nack the secondary_lchan will be NULLed but then the T10
timeout will attempt to release the channel and we will try to release
a NULL pointer.
Diffstat (limited to 'openbsc')
-rw-r--r-- | openbsc/src/libbsc/bsc_api.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index d2965a247..db79eb6bc 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -136,8 +136,12 @@ static void assignment_t10_timeout(void *_conn) LOGP(DMSC, LOGL_ERROR, "Assigment T10 timeout on %p\n", conn); - /* normal release on the secondary channel */ - lchan_release(conn->secondary_lchan, 0, 1); + /* + * normal release on the secondary channel but only if the + * secondary_channel has not been released by the handle_chan_nack. + */ + if (conn->secondary_lchan) + lchan_release(conn->secondary_lchan, 0, 1); conn->secondary_lchan = NULL; /* inform them about the failure */ |