couple more nitpicks

SonarSource · Jul 20, 2023 · 5a4f895 · 5a4f895
1 parent 2cd9d9c
commit 5a4f895
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/...lyzer.Common/SymbolicExecution/Roslyn/RuleChecks/HashesShouldHaveUnpredictableSaltBase.cs b/...lyzer.Common/SymbolicExecution/Roslyn/RuleChecks/HashesShouldHaveUnpredictableSaltBase.cs
@@ -37,8 +37,7 @@ public abstract class HashesShouldHaveUnpredictableSaltBase : CryptographyRuleBa
     protected override ProgramState PreProcessSimple(SymbolicContext context)
     {
         var state = base.PreProcessSimple(context);
-        var instance = context.Operation.Instance;
-        if (instance.AsObjectCreation() is { } objectCreation)
+        if (context.Operation.Instance.AsObjectCreation() is { } objectCreation)
         {
             ProcessObjectCreation(state, objectCreation);
         }

diff --git a/...yzer.Common/SymbolicExecution/Roslyn/RuleChecks/InitializationVectorShouldBeRandomBase.cs b/...yzer.Common/SymbolicExecution/Roslyn/RuleChecks/InitializationVectorShouldBeRandomBase.cs
@@ -34,36 +34,39 @@ protected override ProgramState PreProcessSimple(SymbolicContext context)
         var operation = context.Operation.Instance;
         if (operation.AsAssignment() is { } assignment)
         {
-            return ProcessAssignmentToIVProperty(state, assignment) ?? state;
+            return ProcessAssignmentToIVProperty(state, assignment);
         }
-        else if (operation.AsPropertyReference() is { } property
-            && property.Instance is { } propertyInstance
-            && state.ResolveCaptureAndUnwrapConversion(propertyInstance).TrackedSymbol() is { } propertyInstanceSymbol
-            && IsIVProperty(property, propertyInstanceSymbol)
-            && state[propertyInstance]?.Constraint<ByteCollectionConstraint>() is { } constraint)
+        else if (operation.AsPropertyReference() is { } property)
         {
-            return state.SetOperationConstraint(property, constraint);
+            return ProcessProperyReference(state, property);
         }
         else if (operation.AsInvocation() is { } invocation)
         {
             return ProcessGenerateIV(state, invocation)
-                ?? ProcessCreateEncryptorMethodInvocation(state, invocation)
-                ?? state;
+                ?? ProcessCreateEncryptorMethodInvocation(state, invocation);
         }
         else
         {
             return state;
         }
     }
 
+    private static ProgramState ProcessProperyReference(ProgramState state, IPropertyReferenceOperationWrapper property) =>
+        property.Instance is { } propertyInstance
+        && state.ResolveCaptureAndUnwrapConversion(propertyInstance).TrackedSymbol() is { } propertyInstanceSymbol
+        && IsIVProperty(property, propertyInstanceSymbol)
+        && state[propertyInstance]?.Constraint<ByteCollectionConstraint>() is { } constraint
+            ? state.SetOperationConstraint(property, constraint)
+            : state;
+
     private static ProgramState ProcessAssignmentToIVProperty(ProgramState state, IAssignmentOperationWrapper assignment) =>
         assignment.Target?.AsPropertyReference() is { } property
         && property.Instance is { } propertyInstance
         && state.ResolveCaptureAndUnwrapConversion(propertyInstance).TrackedSymbol() is { } propertyInstanceSymbol
         && IsIVProperty(property, propertyInstanceSymbol)
         && state[assignment.Value]?.HasConstraint(ByteCollectionConstraint.CryptographicallyWeak) is true
             ? state.SetSymbolConstraint(propertyInstanceSymbol, ByteCollectionConstraint.CryptographicallyWeak)
-            : null;
+            : state;
 
     private static ProgramState ProcessGenerateIV(ProgramState state, IInvocationOperationWrapper invocation) =>
         invocation.TargetMethod.Name == nameof(SymmetricAlgorithm.GenerateIV)