From a2cd94f83fcde5781b807f187706e1b24418d041 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 18 May 2011 10:30:08 -0500 Subject: [PATCH] wifi: ignore zero-length SSIDs in internal wifi code Should never get these, and if we do, we should ignore them by leaving the SSID as NULL. --- src/nm-wifi-ap.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/nm-wifi-ap.c b/src/nm-wifi-ap.c index 6eab9581d9..49a60131c4 100644 --- a/src/nm-wifi-ap.c +++ b/src/nm-wifi-ap.c @@ -863,9 +863,14 @@ nm_ap_set_ssid (NMAccessPoint *ap, const GByteArray * ssid) } if (ssid) { - priv->ssid = g_byte_array_sized_new (ssid->len); - priv->ssid->len = ssid->len; - memcpy (priv->ssid->data, ssid->data, ssid->len); + /* Should never get zero-length SSIDs */ + g_warn_if_fail (ssid->len > 0); + + if (ssid->len) + priv->ssid = g_byte_array_sized_new (ssid->len); + priv->ssid->len = ssid->len; + memcpy (priv->ssid->data, ssid->data, ssid->len); + } } g_object_notify (G_OBJECT (ap), NM_AP_SSID);