res_pjsip_config_wizard: Fix leaks and add check for malloc failure.
authorCorey Farrell <git@cfware.com>
Mon, 6 Nov 2017 23:44:01 +0000 (18:44 -0500)
committerCorey Farrell <git@cfware.com>
Mon, 6 Nov 2017 23:44:01 +0000 (18:44 -0500)
wizard_apply_handler():
- Free host if we fail to add it to the vector.

wizard_mapped_observer():
- Check for otw allocation failure.
- Free otw if we fail to add it to the vector.

Change-Id: Ib5d3bcabbd9c24dd8a3c9cc692a794a5f60243ad

res/res_pjsip_config_wizard.c

index 1526dc2..3a761a7 100644 (file)
@@ -1001,7 +1001,10 @@ static int wizard_apply_handler(const struct ast_sorcery *sorcery, struct object
                char *hosts = ast_strdupa(remote_hosts);
 
                while ((host = ast_strsep(&hosts, ',', AST_STRSEP_TRIM))) {
-                       AST_VECTOR_APPEND(&remote_hosts_vector, ast_strdup(host));
+                       host = ast_strdup(host);
+                       if (host && AST_VECTOR_APPEND(&remote_hosts_vector, host)) {
+                               ast_free(host);
+                       }
                }
        }
 
@@ -1168,15 +1171,22 @@ static void wizard_mapped_observer(const char *name, struct ast_sorcery *sorcery
        /* We're only interested in memory wizards with the pjsip_wizard tag. */
        if (wizard_args && !strcmp(wizard_args, "pjsip_wizard")) {
                otw = ast_malloc(sizeof(*otw) + strlen(object_type) + 1);
+               if (!otw) {
+                       return;
+               }
+
                otw->sorcery = sorcery;
                otw->wizard = wizard;
                otw->wizard_data = wizard_data;
                otw->last_config = NULL;
                strcpy(otw->object_type, object_type); /* Safe */
                AST_VECTOR_RW_WRLOCK(&object_type_wizards);
-               AST_VECTOR_APPEND(&object_type_wizards, otw);
+               if (AST_VECTOR_APPEND(&object_type_wizards, otw)) {
+                       ast_free(otw);
+               } else {
+                       ast_debug(1, "Wizard mapped for object_type '%s'\n", object_type);
+               }
                AST_VECTOR_RW_UNLOCK(&object_type_wizards);
-               ast_debug(1, "Wizard mapped for object_type '%s'\n", object_type);
        }
 }