From 84011a9a5c7c4991510cec428940c66c66347771 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 15 Apr 2008 14:09:56 +0000 Subject: [PATCH] 2008-04-15 Dan Williams * nm-setting-ip4-config.c - (ip4_addresses_from_gvalue): handle NULL address array * nm-setting-8021x.c - (verify_tls, verify_ttls): warn on failed verification git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3559 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ libnm-util/nm-setting-8021x.c | 16 ++++++++++++---- libnm-util/nm-setting-ip4-config.c | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a648f74d7..7018867e77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-15 Dan Williams + + * nm-setting-ip4-config.c + - (ip4_addresses_from_gvalue): handle NULL address array + + * nm-setting-8021x.c + - (verify_tls, verify_ttls): warn on failed verification + 2008-04-10 Dan Williams * src/nm-gsm-device.c diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 393edce61a..536736c12a 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -79,11 +79,15 @@ static gboolean verify_tls (NMSetting8021x *self, gboolean phase2) { if (phase2) { - if (!self->phase2_client_cert || !self->phase2_client_cert->len) + if (!self->phase2_client_cert || !self->phase2_client_cert->len) { + g_warning ("%s: phase2 client certificate invalid", __func__); return FALSE; + } } else { - if (!self->client_cert || !self->client_cert->len) + if (!self->client_cert || !self->client_cert->len) { + g_warning ("%s: client certificate invalid", __func__); return FALSE; + } } return TRUE; @@ -92,11 +96,15 @@ verify_tls (NMSetting8021x *self, gboolean phase2) static gboolean verify_ttls (NMSetting8021x *self, gboolean phase2) { - if (!self->identity && !self->anonymous_identity) + if (!self->identity && !self->anonymous_identity) { + g_warning ("%s: missing identity or anonymous identity", __func__); return FALSE; + } - if (!self->phase2_auth && !self->phase2_autheap) + if (!self->phase2_auth && !self->phase2_autheap) { + g_warning ("%s: missing phase2 auth method", __func__); return FALSE; + } return TRUE; } diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 32e494a178..17d4e9e8b9 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -95,7 +95,7 @@ ip4_addresses_from_gvalue (const GValue *value) GSList *list = NULL; addresses = (GPtrArray *) g_value_get_boxed (value); - for (i = 0; i < addresses->len; i++) { + for (i = 0; addresses && (i < addresses->len); i++) { GArray *array = (GArray *) g_ptr_array_index (addresses, i); if (array->len == 2 || array->len == 3) {