mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-01 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Plug memory dbus_message_iter_get_signature leak

Browse source
This commit is contained in:
Calvin Lee 2017-11-08 12:59:43 -07:00
parent 5c8dc9cb73
commit b9f36716b5
4 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
swaybar/tray/sni.c
View file

@ -71,17 +71,13 @@ static void reply_icon(DBusPendingCall *pending, void *_data) {
// Each if here checks the types above before recursing
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
sway_log(L_ERROR, "Relpy type incorrect");
sway_log(L_ERROR, "Should be \"v\", is \"%s\"",
dbus_message_iter_get_signature(&iter));
sway_log(L_ERROR, "Icon relpy type incorrect");
goto bail;
}
dbus_message_iter_recurse(&iter, &variant);
if (strcmp("a(iiay)", dbus_message_iter_get_signature(&variant)) != 0) {
sway_log(L_ERROR, "Relpy type incorrect");
sway_log(L_ERROR, "Should be \"a(iiay)\", is \"%s\"",
dbus_message_iter_get_signature(&variant));
if (dbus_message_iter_check_signature(&variant, "a(iiay)")) {
sway_log(L_ERROR, "Icon relpy type incorrect");
goto bail;
}
@ -237,18 +233,14 @@ static void reply_icon_name(DBusPendingCall *pending, void *_data) {
dbus_message_iter_init(reply, &iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
sway_log(L_ERROR, "Relpy type incorrect");
sway_log(L_ERROR, "Should be \"v\", is \"%s\"",
dbus_message_iter_get_signature(&iter));
sway_log(L_ERROR, "Icon name relpy type incorrect");
goto bail;
}
dbus_message_iter_recurse(&iter, &variant);
if (dbus_message_iter_get_arg_type(&variant) != DBUS_TYPE_STRING) {
sway_log(L_ERROR, "Relpy type incorrect");
sway_log(L_ERROR, "Should be \"s\", is \"%s\"",
dbus_message_iter_get_signature(&iter));
sway_log(L_ERROR, "Icon name relpy type incorrect");
goto bail;
}