--- a/eapol/eapol_framework/eapol_common/common/eap_variable_data.cpp	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/common/eap_variable_data.cpp	Thu Sep 16 13:07:04 2010 +0300
@@ -79,6 +79,7 @@
 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
 
 			delete [] m_data->m_buffer;
+			m_data->m_buffer = 0;
 		}
 		m_data->m_buffer = 0;
 		m_data->m_buffer_length = 0ul;
@@ -431,6 +432,7 @@
 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
 
 			delete [] m_data->m_buffer;
+			m_data->m_buffer = 0;
 			m_data->m_free_buffer = false;
 		}
 		m_data->m_buffer = 0;
@@ -647,6 +649,7 @@
 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
 
 		delete [] m_data->m_buffer;
+		m_data->m_buffer = 0;
 	}
 	
 	m_data->m_buffer = tmp_buffer;