res_pjsip_config_wizard: Memory leak in module_unload

Fixed a memory leak. It removes only the first element.
Added a useful feature in vector.h to remove all items
under the CMP through a callback function / macro.

ASTERISK-26453 #close

Change-Id: I84508353463456d2495678f125738e20052da950

diff --git a/include/asterisk/vector.h b/include/asterisk/vector.h
index be90912..b4a8a2c 100644 (file)
--- a/include/asterisk/vector.h
+++ b/include/asterisk/vector.h
@@ -354,6 +354,30 @@
        AST_VECTOR_REMOVE(vec, idx, 1)
 
 /*!
+ * \brief Remove all elements from a vector that matches the given comparison
+ *
+ * \param vec Vector to remove from.
+ * \param value Value to pass into comparator.
+ * \param cmp Comparator function/macros (called as \c cmp(elem, value))
+ * \param cleanup How to cleanup a removed element macro/function.
+ *
+ * \return the number of deleted elements.
+ */
+#define AST_VECTOR_REMOVE_ALL_CMP_UNORDERED(vec, value, cmp, cleanup) ({       \
+       int count = 0;                                                  \
+       size_t idx;                                                     \
+       typeof(value) __value = (value);                                \
+       for (idx = 0; idx < (vec)->current; ++idx) {                    \
+               if (cmp((vec)->elems[idx], __value)) {                  \
+                       cleanup((vec)->elems[idx]);                     \
+                       AST_VECTOR_REMOVE_UNORDERED((vec), idx);        \
+                       ++count;                                        \
+               }                                                       \
+       }                                                               \
+       count;                                                          \
+})
+
+/*!
  * \brief Remove an element from a vector that matches the given comparison
  *
  * \param vec Vector to remove from.
@@ -380,6 +404,30 @@
 })
 
 /*!
+ * \brief Remove all elements from a vector that matches the given comparison while maintaining order
+ *
+ * \param vec Vector to remove from.
+ * \param value Value to pass into comparator.
+ * \param cmp Comparator function/macros (called as \c cmp(elem, value))
+ * \param cleanup How to cleanup a removed element macro/function.
+ *
+ * \return the number of deleted elements.
+ */
+#define AST_VECTOR_REMOVE_ALL_CMP_ORDERED(vec, value, cmp, cleanup) ({ \
+       int count = 0;                                                  \
+       size_t idx;                                                     \
+       typeof(value) __value = (value);                                \
+       for (idx = 0; idx < (vec)->current; ++idx) {                    \
+               if (cmp((vec)->elems[idx], __value)) {                  \
+                       cleanup((vec)->elems[idx]);                     \
+                       AST_VECTOR_REMOVE_ORDERED((vec), idx);  \
+                       ++count;                                        \
+               }                                                       \
+       }                                                               \
+       oount;                                                          \
+})
+
+/*!
  * \brief Remove an element from a vector that matches the given comparison while maintaining order
  *
  * \param vec Vector to remove from.

diff --git a/res/res_pjsip_config_wizard.c b/res/res_pjsip_config_wizard.c
index cf09a54..aec923d 100644 (file)
--- a/res/res_pjsip_config_wizard.c
+++ b/res/res_pjsip_config_wizard.c
@@ -989,7 +989,7 @@ static int wizard_apply_handler(const struct ast_sorcery *sorcery, struct object
                rc = handle_registrations(sorcery, otw, wiz, &remote_hosts_vector);
        }
 
-       AST_VECTOR_REMOVE_CMP_UNORDERED(&remote_hosts_vector, NULL, NOT_EQUALS, ast_free);
+       AST_VECTOR_REMOVE_ALL_CMP_UNORDERED(&remote_hosts_vector, NULL, NOT_EQUALS, ast_free);
        AST_VECTOR_FREE(&remote_hosts_vector);
 
        ast_debug(4, "%s handler complete.  rc: %d\n", otw->object_type, rc);
@@ -1293,7 +1293,7 @@ static int unload_module(void)
 {
        ast_cli_unregister_multiple(config_wizard_cli, ARRAY_LEN(config_wizard_cli));
        ast_sorcery_global_observer_remove(&global_observer);
-       AST_VECTOR_REMOVE_CMP_UNORDERED(&object_type_wizards, NULL, NOT_EQUALS, OTW_DELETE_CB);
+       AST_VECTOR_REMOVE_ALL_CMP_UNORDERED(&object_type_wizards, NULL, NOT_EQUALS, OTW_DELETE_CB);
        AST_VECTOR_RW_FREE(&object_type_wizards);
 
        return 0;