summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2015-07-02 09:47:58 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-07-02 09:47:58 -0500
commitfa4dd9755a31c7d87b3a815dd19815fb0b67bd33 (patch)
tree48407cd5f8eea4de98b92530869bf78614e673f9
parent45b8a2be31176c217c3a3f53d3c7ae552d723a08 (diff)
parent41610df8d5202802b4b0ac35f8a29410c9306aed (diff)
Merge "chan_vpb.cc: Fix compiler warning Jenkins found."
-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 16a66b908..7cdcf303a 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -2628,14 +2628,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);