fixing index overflow guards

Signed-off-by: eantwuh antal.wu-hen-chang@ericsson.com

src/EPTF_MQTT_LGen_Functions.ttcn

@@ -2076,7 +2076,9 @@ module EPTF_MQTT_LGen_Functions {
   {
     var integer v_idx := f_EPTF_FBQ_getOrCreateFreeSlot(v_MQTT_subscriptionDB.queue);
     f_EPTF_FBQ_moveFromFreeHeadToBusyTail(v_MQTT_subscriptionDB.queue);
-    f_EPTF_MQTT_Logging_DEBUG(log2str(": "," adding subscription ", v_idx, " ", p_sub));
+    f_EPTF_MQTT_Logging_DEBUG(log2str(": "," adding subscription ", v_idx, " ", p_sub));    
+
+    v_MQTT_subscriptionDB.data[v_idx] := p_sub;
 
     if (ispresent(p_sub.request))
     {
@@ -2099,8 +2101,6 @@ module EPTF_MQTT_LGen_Functions {
       }
     }
 
-    v_MQTT_subscriptionDB.data[v_idx] := p_sub;
-
     return v_idx;
   }
 
@@ -2469,7 +2469,7 @@ module EPTF_MQTT_LGen_Functions {
   function f_EPTF_MQTT_session_fromApp(inout EPTF_MQTT_PDU p_msg, in integer p_sIdx)
   runs on EPTF_MQTT_LGen_CT
   {
-    if (p_sIdx < 0 or p_sIdx >= sizeof(v_MQTT_sessionDB.data[p_sIdx]))
+    if (p_sIdx < 0 or p_sIdx >= sizeof(v_MQTT_sessionDB.data))
     {
       f_EPTF_MQTT_Logging_WARNING(log2str(%definitionId, " invalid session index: ", p_sIdx));
       return;
@@ -2646,7 +2646,7 @@ module EPTF_MQTT_LGen_Functions {
   function f_EPTF_MQTT_session_fromEnv(inout EPTF_MQTT_PDU p_msg, in integer p_sIdx)
   runs on EPTF_MQTT_LGen_CT
   {
-    if (p_sIdx < 0 or p_sIdx >= sizeof(v_MQTT_sessionDB.data[p_sIdx]))
+    if (p_sIdx < 0 or p_sIdx >= sizeof(v_MQTT_sessionDB.data))
     {
       f_EPTF_MQTT_Logging_WARNING(log2str(%definitionId, " invalid session index: ", p_sIdx));
       return;
@@ -3125,7 +3125,7 @@ module EPTF_MQTT_LGen_Functions {
   function f_EPTF_MQTT_subscription_fromSession(inout EPTF_MQTT_PDU p_msg, in integer p_subIdx)
   runs on EPTF_MQTT_LGen_CT
   {
-    if (p_subIdx < 0 or p_subIdx >= sizeof(v_MQTT_subscriptionDB.data[p_subIdx]))
+    if (p_subIdx < 0 or p_subIdx >= sizeof(v_MQTT_subscriptionDB.data))
     {
       f_EPTF_MQTT_Logging_WARNING(log2str(%definitionId, " invalid subscription index: ", p_subIdx));
       return;
@@ -3198,7 +3198,7 @@ module EPTF_MQTT_LGen_Functions {
   function f_EPTF_MQTT_subscription_fromEnv(inout EPTF_MQTT_PDU p_msg, in integer p_subIdx)
   runs on EPTF_MQTT_LGen_CT
   {
-    if (p_subIdx < 0 or p_subIdx >= sizeof(v_MQTT_subscriptionDB.data[p_subIdx]))
+    if (p_subIdx < 0 or p_subIdx >= sizeof(v_MQTT_subscriptionDB.data))
     {
       f_EPTF_MQTT_Logging_WARNING(log2str(%definitionId, " invalid subscription index: ", p_subIdx));
       return;
@@ -3466,7 +3466,7 @@ module EPTF_MQTT_LGen_Functions {
   function f_EPTF_MQTT_publish_fromSession(inout EPTF_MQTT_PDU p_msg, in integer p_pubIdx)
   runs on EPTF_MQTT_LGen_CT
   {
-    if (p_pubIdx < 0 or p_pubIdx >= sizeof(v_MQTT_publishDB.data[p_pubIdx]))
+    if (p_pubIdx < 0 or p_pubIdx >= sizeof(v_MQTT_publishDB.data))
     {
       f_EPTF_MQTT_Logging_WARNING(log2str(%definitionId, " invalid publish index: ", p_pubIdx));
       return;
@@ -3551,7 +3551,7 @@ module EPTF_MQTT_LGen_Functions {
   function f_EPTF_MQTT_publish_fromEnv(inout EPTF_MQTT_PDU p_msg, in integer p_pubIdx)
   runs on EPTF_MQTT_LGen_CT
   {
-    if (p_pubIdx < 0 or p_pubIdx >= sizeof(v_MQTT_publishDB.data[p_pubIdx]))
+    if (p_pubIdx < 0 or p_pubIdx >= sizeof(v_MQTT_publishDB.data))
     {
       f_EPTF_MQTT_Logging_WARNING(log2str(%definitionId, " invalid publish index: ", p_pubIdx));
       return;