hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-26 01:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not throw exception when working directory cleanup fails

Browse Source
This commit is contained in:
Tamas Vajk
2023-10-11 20:48:17 +02:00
parent 4f31b5a214
commit da096553a2
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyInfo.cs
View File

@@ -32,7 +32,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
/// <summary>
/// The version number of the .NET Core framework that this assembly targets.
///
///
/// This is extracted from the `TargetFrameworkAttribute` of the assembly, e.g.
/// ```
/// [assembly:TargetFramework(".NETCoreApp,Version=v7.0")]
@@ -165,6 +165,11 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
unsafe
{
var reader = new MetadataReader(metadata.Pointer, metadata.Length);
if (!reader.IsAssembly)
{
throw new AssemblyLoadException();
}
var def = reader.GetAssemblyDefinition();
// This is how you compute the public key token from the full public key.

20
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
View File

@@ -644,9 +644,25 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
public void Dispose()
{
packageDirectory?.Dispose();
try
{
packageDirectory?.Dispose();
}
catch (Exception exc)
{
progressMonitor.LogInfo("Couldn't delete package directory: " + exc.Message);
}
if (cleanupTempWorkingDirectory)
tempWorkingDirectory?.Dispose();
{
try
{
tempWorkingDirectory?.Dispose();
}
catch (Exception exc)
{
progressMonitor.LogInfo("Couldn't delete temporary working directory: " + exc.Message);
}
}
}
}
}