jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

D-Bus: Use NoMemory error message from CreateInterface

Browse source 
Try to be a bit more consistent by using NoMemory instead of InvalidArgs
if os_strdup() fails in the CreateInterface handler.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-01-09 02:31:23 +02:00
parent 635874b55a
commit a354bcc886
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -537,28 +537,28 @@ DBusMessage * wpas_dbus_handler_create_interface(DBusMessage *message,
driver = os_strdup(entry.str_value); driver = os_strdup(entry.str_value);
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
if (driver == NULL) if (driver == NULL)
goto error; goto oom;
} else if (os_strcmp(entry.key, "Ifname") == 0 && } else if (os_strcmp(entry.key, "Ifname") == 0 &&
entry.type == DBUS_TYPE_STRING) { entry.type == DBUS_TYPE_STRING) {
os_free(ifname); os_free(ifname);
ifname = os_strdup(entry.str_value); ifname = os_strdup(entry.str_value);
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
if (ifname == NULL) if (ifname == NULL)
goto error; goto oom;
} else if (os_strcmp(entry.key, "ConfigFile") == 0 && } else if (os_strcmp(entry.key, "ConfigFile") == 0 &&
entry.type == DBUS_TYPE_STRING) { entry.type == DBUS_TYPE_STRING) {
os_free(confname); os_free(confname);
confname = os_strdup(entry.str_value); confname = os_strdup(entry.str_value);
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
if (confname == NULL) if (confname == NULL)
goto error; goto oom;
} else if (os_strcmp(entry.key, "BridgeIfname") == 0 && } else if (os_strcmp(entry.key, "BridgeIfname") == 0 &&
entry.type == DBUS_TYPE_STRING) { entry.type == DBUS_TYPE_STRING) {
os_free(bridge_ifname); os_free(bridge_ifname);
bridge_ifname = os_strdup(entry.str_value); bridge_ifname = os_strdup(entry.str_value);
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
if (bridge_ifname == NULL) if (bridge_ifname == NULL)
goto error; goto oom;
} else { } else {
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
goto error; goto error;
@ -610,6 +610,9 @@ out:
error: error:
reply = wpas_dbus_error_invalid_args(message, NULL); reply = wpas_dbus_error_invalid_args(message, NULL);
goto out; goto out;
oom:
reply = wpas_dbus_error_no_memory(message);
goto out;
} }