Checking for 'value' != None before creating IWbemClass properties (#…

…1854) * Checking for 'value' != None before creating IWbemClass properties * wmiquery - printing exception stack trace only if error is not 'S_FALSE'
fortra · Dec 5, 2024 · ec32e73 · ec32e73
1 parent af51dfd
commit ec32e73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/examples/wmiquery.py b/examples/wmiquery.py
@@ -101,10 +101,10 @@ def printReply(self, iEnum):
                             print('%s |' % record[key]['value'], end=' ')
                     print() 
                 except Exception as e:
-                    if logging.getLogger().level == logging.DEBUG:
-                        import traceback
-                        traceback.print_exc()
                     if str(e).find('S_FALSE') < 0:
+                        if logging.getLogger().level == logging.DEBUG:
+                            import traceback
+                            traceback.print_exc()
                         raise
                     else:
                         break

diff --git a/impacket/dcerpc/v5/dcom/wmi.py b/impacket/dcerpc/v5/dcom/wmi.py
@@ -2613,7 +2613,7 @@ def SpawnInstance(self):
     def createProperties(self, properties):
         for property in properties:
             # Do we have an object property?
-            if properties[property]['type'] == CIM_TYPE_ENUM.CIM_TYPE_OBJECT.value:
+            if properties[property]['type'] == CIM_TYPE_ENUM.CIM_TYPE_OBJECT.value and properties[property]['value'] != None:
                 # Yes.. let's create an Object for it too
                 objRef = OBJREF_CUSTOM()
                 objRef['iid'] = self._iid