Skip to content

Commit 1be922f

Browse files
committed
Correct potential logic bug
1 parent 7c9a577 commit 1be922f

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

VBScript/02_Upfront_Encapsulated_Code_With_No_Dependencies/GetComputerSystemInstancesUsingWMINamespace.vbs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Function GetComputerSystemInstancesUsingWMINamespace(ByRef arrComputerSystemInst
3232
' End If
3333
' End If
3434
'
35-
' Version: 1.0.20210624.0
35+
' Version: 1.0.20210624.1
3636
'endregion FunctionMetadata ####################################################
3737

3838
'region License ####################################################
@@ -101,7 +101,8 @@ Function GetComputerSystemInstancesUsingWMINamespace(ByRef arrComputerSystemInst
101101
Else
102102
If intTemp < 0 Then
103103
intFunctionReturn = intFunctionReturn + (-6 * intReturnMultiplier)
104-
ElseIf intTemp > 0 Then
104+
Else
105+
' intTemp >= 0
105106
intFunctionReturn = intTemp - 1
106107
' -1 would be returned if there are no Win32_ComputerSystem instances
107108
End If

VBScript/02_Upfront_Encapsulated_Code_With_No_Dependencies/GetTPMInstancesUsingWMINamespace.vbs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Function GetTPMInstancesUsingWMINamespace(ByRef arrTPMInstances, ByVal objWMINam
2424
' End If
2525
' End If
2626
'
27-
' Version: 1.0.20210615.0
27+
' Version: 1.0.20210624.0
2828
'endregion FunctionMetadata ####################################################
2929

3030
'region License ####################################################
@@ -73,29 +73,31 @@ Function GetTPMInstancesUsingWMINamespace(ByRef arrTPMInstances, ByVal objWMINam
7373
intReturnMultiplier = 16
7474

7575
If TestObjectForData(objWMINamespace) <> True Then
76-
intFunctionReturn = intFunctionReturn + (-1 * intReturnMultiplier)
76+
intFunctionReturn = intFunctionReturn + (-2 * intReturnMultiplier)
7777
Else
7878
On Error Resume Next
7979
Set arrWorkingTPMInstances = objWMINamespace.InstancesOf("Win32_Tpm")
8080
If Err Then
8181
On Error Goto 0
8282
Err.Clear
83-
intFunctionReturn = intFunctionReturn + (-2 * intReturnMultiplier)
83+
intFunctionReturn = intFunctionReturn + (-3 * intReturnMultiplier)
8484
Else
8585
intTemp = arrWorkingTPMInstances.Count
8686
If Err Then
8787
On Error Goto 0
8888
Err.Clear
89-
intFunctionReturn = intFunctionReturn + (-3 * intReturnMultiplier)
89+
intFunctionReturn = intFunctionReturn + (-4 * intReturnMultiplier)
9090
Else
9191
On Error Goto 0
9292
If TestObjectIsAnyTypeOfInteger(intTemp) = False Then
93-
intFunctionReturn = intFunctionReturn + (-4 * intReturnMultiplier)
93+
intFunctionReturn = intFunctionReturn + (-5 * intReturnMultiplier)
9494
Else
9595
If intTemp < 0 Then
96-
intFunctionReturn = intFunctionReturn + (-5 * intReturnMultiplier)
97-
ElseIf intTemp > 0 Then
96+
intFunctionReturn = intFunctionReturn + (-6 * intReturnMultiplier)
97+
Else
98+
' intTemp >= 0
9899
intFunctionReturn = intTemp
100+
' intFunctionReturn is 0 if there are zero TPMs
99101
End If
100102
End If
101103
End If
@@ -108,7 +110,7 @@ Function GetTPMInstancesUsingWMINamespace(ByRef arrTPMInstances, ByVal objWMINam
108110
If Err Then
109111
On Error Goto 0
110112
Err.Clear
111-
intFunctionReturn = (-6 * intReturnMultiplier)
113+
intFunctionReturn = (-7 * intReturnMultiplier)
112114
Else
113115
On Error Goto 0
114116
End If

0 commit comments

Comments
 (0)