Skip to content

Commit

Permalink
Merge branch 'main' into users/shaopeng-gh/wix
Browse files Browse the repository at this point in the history
  • Loading branch information
shaopeng-gh authored Jul 27, 2023
2 parents d084db9 + a3795dc commit aaf4353
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions src/BinSkim.Rules/PERules/BA2004.EnableSecureSourceCodeHashing.cs
Original file line number Diff line number Diff line change
Expand Up @@ -252,17 +252,20 @@ private void GenerateCompilandsAndLog(BinaryAnalyzerContext context, Dictionary<
compilandsWithOneOrMoreInsecureFileHashes.Remove(HashType.None);
}

string[] messages = new string[compilandsWithOneOrMoreInsecureFileHashes.Count];

int hashTypeCount = 0;
foreach (HashType hashType in compilandsWithOneOrMoreInsecureFileHashes.Keys)
if (compilandsWithOneOrMoreInsecureFileHashes.Count > 0)
{
objectModuleDetails = compilandsWithOneOrMoreInsecureFileHashes[hashType];
messages[hashTypeCount++] = objectModuleDetails.CreateOutputCoalescedByCompiler(hashType.ToString());
}
string[] messages = new string[compilandsWithOneOrMoreInsecureFileHashes.Count];

int hashTypeCount = 0;
foreach (HashType hashType in compilandsWithOneOrMoreInsecureFileHashes.Keys)
{
objectModuleDetails = compilandsWithOneOrMoreInsecureFileHashes[hashType];
messages[hashTypeCount++] = objectModuleDetails.CreateOutputCoalescedByCompiler(hashType.ToString());
}

message = string.Join(Environment.NewLine, messages);
GenerateCompilandsAndLog(context, message, failureLevel);
message = string.Join(Environment.NewLine, messages);
GenerateCompilandsAndLog(context, message, failureLevel);
}
}

private void GenerateCompilandsAndLog(BinaryAnalyzerContext context, string message, FailureLevel failureLevel)
Expand Down

0 comments on commit aaf4353

Please sign in to comment.