projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5515673
)
More DBusError leak fixes
author
Mike Gorse
<mgorse@suse.com>
Thu, 2 May 2013 20:24:22 +0000
(15:24 -0500)
committer
Mike Gorse
<mgorse@suse.com>
Thu, 2 May 2013 20:24:22 +0000
(15:24 -0500)
droute/droute.c
patch
|
blob
|
history
diff --git
a/droute/droute.c
b/droute/droute.c
index
82eea8f
..
838aacd
100644
(file)
--- a/
droute/droute.c
+++ b/
droute/droute.c
@@
-265,7
+265,12
@@
impl_prop_GetAll (DBusMessage *message,
dbus_error_init (&error);
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_STRING, &iface, DBUS_TYPE_INVALID))
dbus_error_init (&error);
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_STRING, &iface, DBUS_TYPE_INVALID))
- return dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ {
+ DBusMessage *ret;
+ ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ dbus_error_free (&error);
+ return ret;
+ }
reply = dbus_message_new_method_return (message);
if (!reply)
reply = dbus_message_new_method_return (message);
if (!reply)
@@
-321,17
+326,26
@@
impl_prop_GetSet (DBusMessage *message,
DBUS_TYPE_STRING,
&(pair.two),
DBUS_TYPE_INVALID))
DBUS_TYPE_STRING,
&(pair.two),
DBUS_TYPE_INVALID))
- return dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ {
+ DBusMessage *ret;
+ ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ dbus_error_free (&error);
+ }
_DROUTE_DEBUG ("DRoute (handle prop): %s|%s on %s\n", pair.one, pair.two, pathstr);
prop_funcs = (PropertyPair *) g_hash_table_lookup (path->properties, &pair);
if (!prop_funcs)
_DROUTE_DEBUG ("DRoute (handle prop): %s|%s on %s\n", pair.one, pair.two, pathstr);
prop_funcs = (PropertyPair *) g_hash_table_lookup (path->properties, &pair);
if (!prop_funcs)
+ {
+ DBusMessage *ret;
#ifdef DBUS_ERROR_UNKNOWN_PROPERTY
#ifdef DBUS_ERROR_UNKNOWN_PROPERTY
- ret
urn
dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable");
+ ret
=
dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable");
#else
#else
- ret
urn
dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+ ret
=
dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
#endif
#endif
+ dbus_error_free (&error);
+ return ret;
+ }
datum = path_get_datum (path, pathstr);
if (!datum)
datum = path_get_datum (path, pathstr);
if (!datum)