Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registrycb.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registrycb.c
index 4b326a1ee2..bd3570cefc 100644
--- a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registrycb.c
+++ b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registrycb.c
@@ -118,9 +118,9 @@ int
 nr_reg_register_callback(NR_registry name, char action, void (*cb)(void *cb_arg, char action, NR_registry name), void *cb_arg)
 {
     int r, _status;
-    r_assoc *assoc;
+    r_assoc *assoc = 0;
     int create_assoc = 0;
-    nr_reg_cb_info *info;
+    nr_reg_cb_info *info = 0;
     int create_info = 0;
     unsigned char cb_id[SIZEOF_CB_ID];
 
@@ -191,7 +191,7 @@ int
 nr_reg_unregister_callback(char *name, char action, void (*cb)(void *cb_arg, char action, NR_registry name))
 {
     int r, _status;
-    r_assoc *assoc;
+    r_assoc *assoc = 0;
     int size;
     unsigned char cb_id[SIZEOF_CB_ID];
 
@@ -283,12 +283,12 @@ int
 nr_reg_raise_event_recurse(char *name, char *tmp, int action)
 {
     int r, _status;
-    r_assoc *assoc;
+    r_assoc *assoc = 0;
     nr_reg_cb_info *info;
     r_assoc_iterator iter;
-    char *key;
+    char *key = 0;
     int keyl;
-    char *c;
+    char *c = 0;
     int free_tmp = 0;
     int count;