diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-11-25 12:23:47 -0600 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-12-01 13:53:18 -0600 |
| commit | 4aed349a7bd2e62d82c5e9535f7cf69263eeb60a (patch) | |
| tree | ba782f1cb0ab1894e999e81bf0dc01d093591ebf /channels/chan_sip.c | |
| parent | 6d9156d10f8941f1da90bf81109904432a2f293d (diff) | |
Audit improper usage of scheduler exposed by 5c713fdf18f. (v13 additions)
chan_sip.c:
* Initialize mwi subscription scheduler ids earlier because of ASTOBJ to
ao2 conversion.
* Initialize register scheduler ids earlier because of ASTOBJ to ao2
conversion.
chan_skinny.c:
* Fix more scheduler usage for the valid 0 id value.
ASTERISK-25476
Change-Id: If9f0e5d99638b2f9d102d1ebc9c5a14b2d706e95
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index bc65784b2..98df83a0e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9374,6 +9374,9 @@ static int sip_register(const char *value, int lineno) return -1; } + reg->expire = -1; + reg->timeout = -1; + if (ast_string_field_init(reg, 256)) { ao2_t_ref(reg, -1, "failed to string_field_init, drop reg"); return -1; @@ -9447,6 +9450,8 @@ static int sip_subscribe_mwi(const char *value, int lineno) return -1; } + mwi->resub = -1; + if (ast_string_field_init(mwi, 256)) { ao2_t_ref(mwi, -1, "failed to string_field_init, drop mwi"); return -1; @@ -9461,7 +9466,6 @@ static int sip_subscribe_mwi(const char *value, int lineno) } ast_string_field_set(mwi, hostname, hostname); ast_string_field_set(mwi, mailbox, mailbox); - mwi->resub = -1; mwi->portno = portnum; mwi->transport = transport; |