summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2015-07-02 09:47:48 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-07-02 09:47:49 -0500
commita9f721303d1ec80b06d4f6852ffbd0b558b06e0d (patch)
treeefc8ddc4dabe94d54b601c6ddf2049e141362256
parentde3678c92e57083c1332eabf129cd1551dd0b625 (diff)
parent78a1f4aa4683702f5c5747b677a7944cb94866c3 (diff)
Merge "chan_vpb.cc: Fix compiler warning Jenkins found." into 13
-rw-r--r--channels/chan_vpb.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 181e50aee..f1ed39217 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -2626,14 +2626,13 @@ static int unload_module(void)
if (bridges) {
ast_mutex_lock(&bridge_lock);
- memset(bridges, 0, sizeof bridges);
- ast_mutex_unlock(&bridge_lock);
- ast_mutex_destroy(&bridge_lock);
for (int i = 0; i < max_bridges; i++) {
ast_mutex_destroy(&bridges[i].lock);
ast_cond_destroy(&bridges[i].cond);
}
ast_free(bridges);
+ bridges = NULL;
+ ast_mutex_unlock(&bridge_lock);
}
ao2_cleanup(vpb_tech.capabilities);