Merge pull request #506 from DMTF/Various-Hardening

Added check to ensure an action is shown in the response as an object before trying to discover if it has action info
DMTF · Jul 15, 2022 · e6748c5 · e6748c5
2 parents 3977679 + c014c2f
commit e6748c5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/common/catalog.py b/common/catalog.py
@@ -1055,11 +1055,12 @@ def getLinks(self):
                 if n == 'Actions':
                     new_type = item.Type.catalog.getTypeInCatalog('ActionInfo.ActionInfo')
                     for act in item.Value.values():
-                        uri = act.get('@Redfish.ActionInfo')
-                        if isinstance(uri, str):
-                            my_link = RedfishObject(new_type, 'ActionInfo', item).populate({'@odata.id': uri})
-                            my_link.InAnnotation = True
-                            links.append(my_link)
+                        if isinstance(act, dict):
+                            uri = act.get('@Redfish.ActionInfo')
+                            if isinstance(uri, str):
+                                my_link = RedfishObject(new_type, 'ActionInfo', item).populate({'@odata.id': uri})
+                                my_link.InAnnotation = True
+                                links.append(my_link)
                 if item.Type.IsNav:
                     if isinstance(item.Value, list):
                         for num, val in enumerate(item.Value):