From e37ba613bff1b0e16f816fe5078fe9cbe316a37b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 29 Jul 2004 16:00:48 +0000 Subject: [PATCH] 2004-07-29 Dan Williams * info-daemon/NetworkManagerInfoDbus.c src/NetworkManagerAPList.c - Ensure that 'network' is not empty git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@31 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- info-daemon/NetworkManagerInfoDbus.c | 9 ++++++--- src/NetworkManagerAPList.c | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c index 65a1d22437..ce74b03eeb 100644 --- a/info-daemon/NetworkManagerInfoDbus.c +++ b/info-daemon/NetworkManagerInfoDbus.c @@ -235,7 +235,8 @@ static DBusMessage *nmi_dbus_get_allowed_network_prio (NMIAppInfo *info, DBusMes g_return_val_if_fail (message != NULL, NULL); dbus_error_init (&error); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID)) + if ( !dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID) + || (strlen (network) <= 0)) { reply_message = nmi_dbus_create_error_message (message, NMI_DBUS_NMI_NAMESPACE, "InvalidNetwork", "NetworkManagerInfo::getAllowedNetworkPriority called with invalid network."); @@ -283,7 +284,8 @@ static DBusMessage *nmi_dbus_get_allowed_network_essid (NMIAppInfo *info, DBusMe g_return_val_if_fail (message != NULL, NULL); dbus_error_init (&error); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID)) + if ( !dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID) + || (strlen (network) <= 0)) { reply_message = nmi_dbus_create_error_message (message, NMI_DBUS_NMI_NAMESPACE, "InvalidNetwork", "NetworkManagerInfo::getAllowedNetworkEssid called with invalid network."); @@ -331,7 +333,8 @@ static DBusMessage *nmi_dbus_get_allowed_network_key (NMIAppInfo *info, DBusMess g_return_val_if_fail (message != NULL, NULL); dbus_error_init (&error); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID)) + if ( !dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID) + || (strlen (network) <= 0)) { reply_message = nmi_dbus_create_error_message (message, NMI_DBUS_NMI_NAMESPACE, "InvalidNetwork", "NetworkManagerInfo::getAllowedNetworkKey called with invalid network."); diff --git a/src/NetworkManagerAPList.c b/src/NetworkManagerAPList.c index ab026643c8..cd16558fa9 100644 --- a/src/NetworkManagerAPList.c +++ b/src/NetworkManagerAPList.c @@ -121,7 +121,10 @@ void nm_ap_list_populate (NMData *data) { int i; for (i = 0; i < num_networks; i++) - nm_ap_list_update_network (data, networks[i]); + { + if (networks[i] && (strlen (networks[i]) > 0)) + nm_ap_list_update_network (data, networks[i]); + } dbus_free_string_array (networks); }