hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

C#: Dispose IDisposables

Browse Source
This commit is contained in:
Tamas Vajk
2020-10-02 11:36:42 +02:00
parent e208f3d21d
commit 71faa51270
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
csharp/extractor/Semmle.Extraction.CSharp.Standalone/Program.cs
View File

@@ -54,7 +54,7 @@ namespace Semmle.Extraction.CSharp.Standalone
{
var options = Options.Create(args);
// options.CIL = true; // To do: Enable this
var output = new ConsoleLogger(options.Verbosity);
using var output = new ConsoleLogger(options.Verbosity);
if (options.Help)
{
@@ -79,13 +79,15 @@ namespace Semmle.Extraction.CSharp.Standalone
if (!options.SkipExtraction)
{
using var fileLogger = new FileLogger(options.Verbosity, Extractor.GetCSharpLogPath());
output.Log(Severity.Info, "");
output.Log(Severity.Info, "Extracting...");
Extractor.ExtractStandalone(
a.Extraction.Sources,
a.References,
new ExtractionProgress(output),
new FileLogger(options.Verbosity, Extractor.GetCSharpLogPath()),
fileLogger,
options);
output.Log(Severity.Info, $"Extraction completed in {DateTime.Now - start}");
}

2
csharp/extractor/Semmle.Extraction.CSharp/Extractor.cs
View File

@@ -66,7 +66,7 @@ namespace Semmle.Extraction.CSharp
stopwatch.Start();
var commandLineArguments = Options.CreateWithEnvironment(args);
var fileLogger = new FileLogger(commandLineArguments.Verbosity, GetCSharpLogPath());
var logger = commandLineArguments.Console
using var logger = commandLineArguments.Console
? new CombinedLogger(new ConsoleLogger(commandLineArguments.Verbosity), fileLogger)
: (ILogger)fileLogger;

2
csharp/extractor/Semmle.Extraction.Tests/TrapWriter.cs
View File

@@ -25,7 +25,7 @@ namespace Semmle.Extraction.Tests
root3 = "/";
}
var logger = new LoggerMock();
using var logger = new LoggerMock();
Assert.Equal($@"C:\Temp\source_archive\def.cs", TrapWriter.NestPaths(logger, @"C:\Temp\source_archive", "def.cs").Replace('/', '\\'));

4
csharp/extractor/Semmle.Util/Logger.cs
View File

@@ -69,8 +69,8 @@ namespace Semmle.Util.Logging
string? dir = Path.GetDirectoryName(outputFile);
if (!string.IsNullOrEmpty(dir) && !System.IO.Directory.Exists(dir))
Directory.CreateDirectory(dir);
writer = new PidStreamWriter(new FileStream(outputFile, FileMode.Append, FileAccess.Write,
FileShare.ReadWrite, 8192));
writer = new PidStreamWriter(
new FileStream(outputFile, FileMode.Append, FileAccess.Write, FileShare.ReadWrite, 8192));
}
catch (Exception ex) // lgtm[cs/catch-of-all-exceptions]
{