commit 321d2e95499981ca8aa4c02027c0359d61115ff2
author elumalai <deepika.e@tataelxsi.co.in> Fri Apr 28 17:03:07 2023 +0530
committer aticig <gulsum.atici@canonical.com> Sun Jun 11 18:56:50 2023 +0200
tree b4e9f1af6627d4b2aeec39ec56d41b07bd27e820
parent c53829da297cc23e651d4ac97e1b847db67099bb

Coverity CWE 476: NULL Pointer Dereference

Added fixes for NULL Pointer Dereference Coverity Issue

Change-Id: I2c68ff720f563631fba3ea8586e325a163d752c6
Signed-off-by: elumalai <deepika.e@tataelxsi.co.in>

NG-RO/osm_ng_ro/ns.py

diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py
index 75bae1b..cd75025 100644
--- a/NG-RO/osm_ng_ro/ns.py
+++ b/NG-RO/osm_ng_ro/ns.py
@@ -2370,7 +2370,7 @@
         for target_vnf in target_list:
             # Find this VNF in the list from DB, raise exception if vnfInstanceId is not found
             vnfr_id = target_vnf["vnfInstanceId"]
-            existing_vnf = db_vnfrs.get(vnfr_id)
+            existing_vnf = db_vnfrs.get(vnfr_id, {})
             db_record = "vnfrs:{}:{}".format(vnfr_id, db_path)
             # vim_account_id = existing_vnf.get("vim-account-id", "")
 
@@ -2390,16 +2390,17 @@
                 # For single session VDU count-indes is 0
                 count_index = target_vdu.get("count-index", 0)
                 item_index = 0
-                existing_instance = None
-                for instance in existing_vnf.get("vdur", None):
-                    if (
-                        instance["vdu-name"] == vdu_name
-                        and instance["count-index"] == count_index
-                    ):
-                        existing_instance = instance
-                        break
-                    else:
-                        item_index += 1
+                existing_instance = {}
+                if existing_vnf:
+                    for instance in existing_vnf.get("vdur", {}):
+                        if (
+                            instance["vdu-name"] == vdu_name
+                            and instance["count-index"] == count_index
+                        ):
+                            existing_instance = instance
+                            break
+                        else:
+                            item_index += 1
 
                 target_record_id = "{}.{}".format(db_record, existing_instance["id"])
 

NG-RO/osm_ng_ro/ro_main.py

diff --git a/NG-RO/osm_ng_ro/ro_main.py b/NG-RO/osm_ng_ro/ro_main.py
index f67d1cb..c0e47ae 100644
--- a/NG-RO/osm_ng_ro/ro_main.py
+++ b/NG-RO/osm_ng_ro/ro_main.py
@@ -687,7 +687,7 @@
         **kwargs,
     ):
         token_info = None
-        outdata = None
+        outdata = {}
         _format = None
         method = "DONE"
         rollback = []