eapol/eapol_framework/eapol_common/common/eap_variable_data.cpp
changeset 52 c23bdf5a328a
parent 33 938269283a16
equal deleted inserted replaced
51:e863583e6720 52:c23bdf5a328a
    77 				m_am_tools->memset(m_data->m_buffer, 0, m_data->m_buffer_length);
    77 				m_am_tools->memset(m_data->m_buffer, 0, m_data->m_buffer_length);
    78 			}
    78 			}
    79 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
    79 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
    80 
    80 
    81 			delete [] m_data->m_buffer;
    81 			delete [] m_data->m_buffer;
       
    82 			m_data->m_buffer = 0;
    82 		}
    83 		}
    83 		m_data->m_buffer = 0;
    84 		m_data->m_buffer = 0;
    84 		m_data->m_buffer_length = 0ul;
    85 		m_data->m_buffer_length = 0ul;
    85 		m_data->m_real_data_start_index = 0ul;
    86 		m_data->m_real_data_start_index = 0ul;
    86 		m_data->m_real_data_length = 0ul;
    87 		m_data->m_real_data_length = 0ul;
   429 #if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
   430 #if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
   430 			m_am_tools->memset(m_data->m_buffer, 0, m_data->m_buffer_length);
   431 			m_am_tools->memset(m_data->m_buffer, 0, m_data->m_buffer_length);
   431 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
   432 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
   432 
   433 
   433 			delete [] m_data->m_buffer;
   434 			delete [] m_data->m_buffer;
       
   435 			m_data->m_buffer = 0;
   434 			m_data->m_free_buffer = false;
   436 			m_data->m_free_buffer = false;
   435 		}
   437 		}
   436 		m_data->m_buffer = 0;
   438 		m_data->m_buffer = 0;
   437 		m_data->m_buffer_length = 0u;
   439 		m_data->m_buffer_length = 0u;
   438 		m_data->m_real_data_start_index = 0ul;
   440 		m_data->m_real_data_start_index = 0ul;
   645 #if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
   647 #if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
   646 		m_am_tools->memset(m_data->m_buffer, 0, m_data->m_buffer_length);
   648 		m_am_tools->memset(m_data->m_buffer, 0, m_data->m_buffer_length);
   647 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
   649 #endif //#if !defined(NO_EAP_VARIABLE_DATA_MEMORY_ZERO)
   648 
   650 
   649 		delete [] m_data->m_buffer;
   651 		delete [] m_data->m_buffer;
       
   652 		m_data->m_buffer = 0;
   650 	}
   653 	}
   651 	
   654 	
   652 	m_data->m_buffer = tmp_buffer;
   655 	m_data->m_buffer = tmp_buffer;
   653 	m_data->m_buffer_length = required_buffer_length;
   656 	m_data->m_buffer_length = required_buffer_length;
   654 	m_data->m_real_data_start_index = 0ul; // Data is now in the begin of the new buffer.
   657 	m_data->m_real_data_start_index = 0ul; // Data is now in the begin of the new buffer.