1 files changed, 3 insertions, 0 deletions

diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index 8a9db66..64d8752 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -60,28 +60,31 @@ QString WExtensions::station(){
     return (const char*) buffer;
   }
   return QString::null;
 }
 
 /**
  * @return QString the essid of the host 802.11 access point.
  */ 
 QString WExtensions::essid(){
   if(!hasWirelessExtensions)
     return QString();
   const char* buffer[200];
+  memset(buffer,0x00,200);
   iwr.u.data.pointer = (caddr_t) buffer;
   iwr.u.data.length = IW_ESSID_MAX_SIZE;
   iwr.u.data.flags = 0;
   if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr )){
+    if (iwr.u.essid.length > IW_ESSID_MAX_SIZE)
+      iwr.u.essid.length = IW_ESSID_MAX_SIZE;
     buffer[(unsigned int) iwr.u.essid.length] = '\0';
     return (const char*) buffer;
   }
   return QString::null;
 }
 
 /**
  * @return QString the mode of interface
  */ 
 QString WExtensions::mode(){
   if(!hasWirelessExtensions)
     return QString();