]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: fix compiler warning about uninitialized var and make sure allocated memory...
authorSeven Du <dujinfang@gmail.com>
Sat, 31 Jan 2015 04:29:02 +0000 (12:29 +0800)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:46:57 +0000 (12:46 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 46f1ab7e31d6f3496aa24174ffd4d791611b276f..7afc3f7f85a2f5402c103764d38b4aaacf5b7982 100644 (file)
@@ -789,10 +789,11 @@ static void conference_parse_layouts(conference_obj_t *conference)
                                }
 
                                lg = switch_core_alloc(conference->pool, sizeof(*lg));
+                               memset(lg, 0, sizeof(*lg));
 
                                while(x_layout) {
                                        const char *name = x_layout->txt;
-                                       layout_node_t *lnode, *last_lnode;
+                                       layout_node_t *lnode, *last_lnode = NULL;
 
                                        if ((lnode = switch_core_hash_find(conference->layout_hash, name))) {