diff -r bad0cc58d154 -r c74b3d9f6b9e eapol/eapol_framework/eapol_common/common/eap_general_header_base.cpp
--- a/eapol/eapol_framework/eapol_common/common/eap_general_header_base.cpp	Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/common/eap_general_header_base.cpp	Wed Sep 01 12:23:57 2010 +0100
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 11.1.2 %
+* %version: 13 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -53,6 +53,7 @@
 	, m_error_detected(true)
 #endif //#if defined(USE_EAP_ERROR_TESTS)
 {
+	EAP_ASSERT((m_header_buffer != 0 && m_header_buffer_length > 0ul) || (m_header_buffer == 0 && m_header_buffer_length == 0ul));
 }
 
 EAP_FUNC_EXPORT void eap_general_header_base_c::set_header_buffer(u8_t * const header_buffer, const u32_t header_buffer_length)
@@ -63,6 +64,8 @@
 
 EAP_FUNC_EXPORT u8_t * eap_general_header_base_c::get_header_buffer(const u32_t data_length) const
 {
+	EAP_ASSERT(m_header_buffer != 0 && m_header_buffer_length > 0ul && m_header_buffer_length >= data_length);
+
 	if (m_header_buffer_length >= data_length)
 	{
 		return m_header_buffer;