Merge "res/res_stasis: Fix accidental subscription to 'all' bridge topic"
authorMatt Jordan <mjordan@digium.com>
Mon, 28 Sep 2015 13:36:09 +0000 (08:36 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 28 Sep 2015 13:36:09 +0000 (08:36 -0500)
res/res_stasis.c

index 69e9b93..abca895 100644 (file)
@@ -1294,7 +1294,9 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
 
                if (bridge != last_bridge) {
                        app_unsubscribe_bridge(app, last_bridge);
-                       app_subscribe_bridge(app, bridge);
+                       if (bridge) {
+                               app_subscribe_bridge(app, bridge);
+                       }
                }
 
                if (bridge) {