diff options
| author | Dan Williams <dcbw@redhat.com> | 2004-07-29 16:00:48 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2004-07-29 16:00:48 +0000 |
| commit | e37ba613bff1b0e16f816fe5078fe9cbe316a37b (patch) | |
| tree | 7aae3534c6d7040670a2325ce115af87aa8068bd /info-daemon | |
| parent | d9fa4c029382db201d55817b058e92d6ef96f321 (diff) | |
| download | NetworkManager-e37ba613bff1b0e16f816fe5078fe9cbe316a37b.tar.gz | |
2004-07-29 Dan Williams <dcbw@redhat.com>
* 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
Diffstat (limited to 'info-daemon')
| -rw-r--r-- | info-daemon/NetworkManagerInfoDbus.c | 9 |
1 files changed, 6 insertions, 3 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."); |