Merge remote-tracking branch 'origin/negativeIndex_cppcheck_fix_on_w27_2023'...

Merge remote-tracking branch 'origin/negativeIndex_cppcheck_fix_on_w27_2023' into integration_2023_w33

executables/softmodem-common.c

@@ -109,7 +109,7 @@ void get_common_options(uint32_t execmask) {
   config_set_checkfunctions(cmdline_params, cmdline_CheckParams, numparams);
   config_get(cmdline_params, sizeof(cmdline_params) / sizeof(paramdef_t), NULL);
   nfapi_index = config_paramidx_fromname(cmdline_params, sizeof(cmdline_params) / sizeof(paramdef_t),"nfapi");
-  AssertFatal(nfapi_index != -1,"Index for nfapi config option not found!");
+  AssertFatal(nfapi_index >= 0,"Index for nfapi config option not found!");
   nfapi_mode = config_get_processedint(&cmdline_params[nfapi_index]);
 
   paramdef_t cmdline_logparams[] =CMDLINE_LOGPARAMS_DESC ;

openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c

@@ -2899,7 +2899,7 @@ uint8_t compute_srs_resource_indicator(NR_PUSCH_ServingCellConfig_t *pusch_servi
       }
       if (count>0) {
         nbits = ceil(log2(count));
-        if (val && srs_feedback && nbits > 0) {
+        if (val && srs_feedback && count > 1) {
           *val = table_7_3_1_1_2_32[count-2][srs_feedback->sri];
         }
       }