projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add NULL check to fix crash when receiving a dbus reply after cleanup
[platform/core/uifw/at-spi2-atk.git]
/
droute
/
droute.c
diff --git
a/droute/droute.c
b/droute/droute.c
index
f1ff993
..
82eea8f
100644
(file)
--- a/
droute/droute.c
+++ b/
droute/droute.c
@@
-107,7
+107,7
@@
path_new (DRouteContext *cnx,
new_path->properties = g_hash_table_new_full ((GHashFunc)str_pair_hash,
str_pair_equal,
g_free,
new_path->properties = g_hash_table_new_full ((GHashFunc)str_pair_hash,
str_pair_equal,
g_free,
-
NULL
);
+
g_free
);
new_path->introspect_children_cb = introspect_children_cb;
new_path->introspect_children_data = introspect_children_data;
new_path->introspect_children_cb = introspect_children_cb;
new_path->introspect_children_data = introspect_children_data;
@@
-123,9
+123,10
@@
path_free (DRoutePath *path, gpointer user_data)
g_free (path->path);
g_string_chunk_free (path->chunks);
g_ptr_array_free (path->interfaces, TRUE);
g_free (path->path);
g_string_chunk_free (path->chunks);
g_ptr_array_free (path->interfaces, TRUE);
- g_
ptr_array_free (path->introspection, FALSE
);
+ g_
free(g_ptr_array_free (path->introspection, FALSE)
);
g_hash_table_destroy (path->methods);
g_hash_table_destroy (path->properties);
g_hash_table_destroy (path->methods);
g_hash_table_destroy (path->properties);
+ g_free (path);
}
static void *
}
static void *
@@
-154,6
+155,7
@@
void
droute_free (DRouteContext *cnx)
{
g_ptr_array_foreach (cnx->registered_paths, (GFunc) path_free, NULL);
droute_free (DRouteContext *cnx)
{
g_ptr_array_foreach (cnx->registered_paths, (GFunc) path_free, NULL);
+ g_ptr_array_free (cnx->registered_paths, TRUE);
g_free (cnx);
}
g_free (cnx);
}