Fixed crash when subscribing to a channel or service would fail
This commit is contained in:
parent
47bc9b2d8f
commit
36af656f2e
1 changed files with 12 additions and 10 deletions
|
@ -376,11 +376,12 @@ http_stream_service(http_connection_t *hc, service_t *service)
|
||||||
|
|
||||||
pthread_mutex_unlock(&global_lock);
|
pthread_mutex_unlock(&global_lock);
|
||||||
|
|
||||||
|
if(s) {
|
||||||
http_stream_run(hc, &sq, s);
|
http_stream_run(hc, &sq, s);
|
||||||
|
|
||||||
pthread_mutex_lock(&global_lock);
|
pthread_mutex_lock(&global_lock);
|
||||||
subscription_unsubscribe(s);
|
subscription_unsubscribe(s);
|
||||||
pthread_mutex_unlock(&global_lock);
|
pthread_mutex_unlock(&global_lock);
|
||||||
|
}
|
||||||
|
|
||||||
globalheaders_destroy(gh);
|
globalheaders_destroy(gh);
|
||||||
tsfix_destroy(tsfix);
|
tsfix_destroy(tsfix);
|
||||||
|
@ -411,11 +412,12 @@ http_stream_channel(http_connection_t *hc, channel_t *ch)
|
||||||
0);
|
0);
|
||||||
pthread_mutex_unlock(&global_lock);
|
pthread_mutex_unlock(&global_lock);
|
||||||
|
|
||||||
|
if(s) {
|
||||||
http_stream_run(hc, &sq, s);
|
http_stream_run(hc, &sq, s);
|
||||||
|
|
||||||
pthread_mutex_lock(&global_lock);
|
pthread_mutex_lock(&global_lock);
|
||||||
subscription_unsubscribe(s);
|
subscription_unsubscribe(s);
|
||||||
pthread_mutex_unlock(&global_lock);
|
pthread_mutex_unlock(&global_lock);
|
||||||
|
}
|
||||||
|
|
||||||
globalheaders_destroy(gh);
|
globalheaders_destroy(gh);
|
||||||
tsfix_destroy(tsfix);
|
tsfix_destroy(tsfix);
|
||||||
|
|
Loading…
Add table
Reference in a new issue