[Fix prevent issue]

- CID 392192 (collection-adaptor.c:typematch - Missing return statement)
- CID 388252 (bridge.c:add_event_from_iter - Dereference null return value)
- CID 389362 (event.c:text_remove_event_listener - Uninitialized pointer read)
- CID 405632 (event.c:text_insert_event_listener - Uninitialized pointer read)

Change-Id: I40ee086b65901f6d8a1fb457d320bfd6dfd49397

diff --git a/atk-adaptor/adaptors/collection-adaptor.c b/atk-adaptor/adaptors/collection-adaptor.c
index af45afcc93469b3ac13f6600d6e0e1d2370ab672..97016b7f04e56d773709b2739a96c37e3c3f7249 100644 (file)
--- a/atk-adaptor/adaptors/collection-adaptor.c
+++ b/atk-adaptor/adaptors/collection-adaptor.c
@@ -1182,6 +1182,8 @@ types_match (DBusMessageIter *iter, char c)
     return TRUE;
   else if (t != c)
     return FALSE;
+
+  return FALSE;
 }
 
 static void

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index aeabb9199468b017bd7daa913fa83c6089ddb6f3..e5420944580048f70936c095fbc48386ab6c9644 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -200,7 +200,11 @@ add_property_to_event (event_data *evdata, const char *property)
   }
 
   prop->name = g_strdup (property);
-  evdata->properties = g_slist_append (evdata->properties, prop);
+
+  if (evdata)
+  {
+    evdata->properties = g_slist_append (evdata->properties, prop);
+  }
 }
 
 static void

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index 0430271c45f068730efc902e663af3d7e6d22ab7..0662664d2ccea3214e2137528c9c9e15e55949f2 100644 (file)
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -913,7 +913,7 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint,
   guint text_changed_signal_id;
   GSignalQuery signal_query;
   const gchar *name;
-  const gchar *minor_raw, *text;
+  const gchar *minor_raw, *text = NULL;
   gchar *minor;
   gint detail1 = 0, detail2 = 0;
 
@@ -942,8 +942,9 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint,
   if (G_VALUE_TYPE (&param_values[3]) == G_TYPE_STRING)
     text = g_value_get_string (&param_values[3]);
 
-  emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
-              DBUS_TYPE_STRING_AS_STRING, text, append_basic);
+  if (text != NULL)
+    emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
+                DBUS_TYPE_STRING_AS_STRING, text, append_basic);
   g_free (minor);
   return TRUE;
 }
@@ -962,7 +963,7 @@ text_remove_event_listener (GSignalInvocationHint * signal_hint,
   guint text_changed_signal_id;
   GSignalQuery signal_query;
   const gchar *name;
-  const gchar *minor_raw, *text;
+  const gchar *minor_raw, *text = NULL;
   gchar *minor;
   gint detail1 = 0, detail2 = 0;
 
@@ -991,8 +992,9 @@ text_remove_event_listener (GSignalInvocationHint * signal_hint,
   if (G_VALUE_TYPE (&param_values[3]) == G_TYPE_STRING)
     text = g_value_get_string (&param_values[3]);
 
-  emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
-              DBUS_TYPE_STRING_AS_STRING, text, append_basic);
+  if (text != NULL)
+    emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
+                DBUS_TYPE_STRING_AS_STRING, text, append_basic);
   g_free (minor);
   return TRUE;
 }