Fix issue for EPS NAS msg Container

src/nas/ies/EPS_NAS_Message_Container.cpp

@@ -94,22 +94,24 @@ int EPS_NAS_Message_Container::decodefrombuffer(
     uint8_t* buf, int len, bool is_option) {
   Logger::nas_mm().debug("Decoding EPS_NAS_Message_Container iei (0x%x)", *buf);
   int decoded_size = 0;
+  int result       = 0;
   if (is_option) {
     decoded_size++;
   }
   length = 0;
-  length |= *(buf + decoded_size);
-  decoded_size++;
-  length |= (*(buf + decoded_size)) << 8;
-  decoded_size++;
+  DECODE_U16(buf + decoded_size, length, decoded_size);
+  result =
       decode_bstring(&_value, length, (buf + decoded_size), len - decoded_size);
   decoded_size += length;
+  if (result == length) {
     for (int i = 0; i < length; i++) {
       Logger::nas_mm().debug(
           "Decoded EPS_NAS_Message_Container value (0x%x)",
           (uint8_t) _value->data[i]);
     }
+  }
+
   Logger::nas_mm().debug(
-      "Decoded EPS_NAS_Message_Container len (%d)", decoded_size);
+      "Decoded EPS_NAS_Message_Container Length (%d)", decoded_size);
   return decoded_size;
 }

src/nas/ies/UESecurityCapability.cpp

@@ -153,6 +153,7 @@ int UESecurityCapability::decodefrombuffer(
   decoded_size++;
   if (length >= 4) decoded_size += (length - 2);  // TODO: decoding EEA EIA
   Logger::nas_mm().debug(
-      "UESecurityCapability EA 0x%d,IA 0x%d", _5g_EASel, _5g_IASel);
+      "UESecurityCapability (length %d) EA 0x%x,IA 0x%x", length, _5g_EASel,
+      _5g_IASel);
   return decoded_size;
 }