Merge branch 'fix_n2_ho_request' into 'fix_n2_handover'

HO Request Fix

See merge request oai/cn5g/oai-cn5g-amf!194

src/common/conversions.cpp

@@ -306,10 +306,10 @@ bool conv::octet_string_2_bit_string(
 
 //------------------------------------------------------------------------------
 bool conv::bstring_2_bit_string(const bstring& b_str, BIT_STRING_t& bit_str) {
-  OCTET_STRING_t octet_str;
-  bstring_2_octet_string(b_str, octet_str);
-  octet_string_2_bit_string(octet_str, bit_str, 0);
-  /*
+    //OCTET_STRING_t octet_str;
+    //bstring_2_octet_string(b_str, octet_str);
+ // octet_string_2_bit_string(octet_str, bit_str, 0);
+  
 
     int size = blength(b_str);
     if (!b_str or size <= 0) return false;
@@ -318,13 +318,13 @@ bool conv::bstring_2_bit_string(const bstring& b_str, BIT_STRING_t& bit_str) {
     bit_str.buf = (uint8_t*) calloc(size + 1, sizeof(uint8_t));
     if (!bit_str.buf) return false;
 
-    if (check_bstring (b_str)) memcpy((void*) bit_str.buf, (char*)octet_str.buf,
+    if (check_bstring (b_str)) memcpy((void*) bit_str.buf, (char*)b_str->data,
     blength(b_str));
     ((uint8_t*) bit_str.buf)[size] = '\0';
     bit_str.size                   = size;
 
           bit_str.bits_unused            = 0;
-  */
+  
   return true;
 }
 

src/ngap/ngapMsgs/NgapMessage.cpp

@@ -41,7 +41,8 @@ NgapMessage::NgapMessage() {
 
 //------------------------------------------------------------------------------
 NgapMessage::~NgapMessage() {
-  ASN_STRUCT_FREE(asn_DEF_Ngap_NGAP_PDU, ngapPdu);
+  if(ngapPdu)
+    ASN_STRUCT_FREE(asn_DEF_Ngap_NGAP_PDU, ngapPdu);
   Logger::ngap().debug("Free NGAP Message PDU");
 }