Skip to content

Commit 7226a92

Browse files
committed
Fix 7 remaining nullable cascading errors
- DotNetDisassembleService: add null-forgiving (!) after success guards for ilText, DisassembleCommandAndItsVersionWithArguments, and stdout; add null check before DeleteFileSilent(tempAsciiPath) - ProgramRunner: mark LoadConfigurationAsync parameter as string? https://claude.ai/code/session_01AGt95LCMWEQgJoQZraKb9V
1 parent 882806e commit 7226a92

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

ProgramRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ private static void PrepareReportsDirectory(string reportsFolderAbsolutePath)
373373
Directory.CreateDirectory(reportsFolderAbsolutePath);
374374
}
375375

376-
private async Task<ConfigSettings> LoadConfigurationAsync(string configPath)
376+
private async Task<ConfigSettings> LoadConfigurationAsync(string? configPath)
377377
{
378378
_logger.LogMessage(AppLogLevel.Info, LOG_LOADING_CONFIGURATION, shouldOutputMessageToConsole: true);
379379
var config = await _configService.LoadConfigAsync(configPath);

Services/DotNetDisassembleService.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public DotNetDisassembleService(ConfigSettings config, ILCache? ilCache, FileDif
119119
var (success, ilText, disassembleCommandAndItsVersionWithArguments, error) = await TryDisassembleAsync(candidateDisassembleCommand, dotNetAssemblyfileAbsolutePath, allowCache: true, recordUsage: true);
120120
if (success)
121121
{
122-
return (ilText, disassembleCommandAndItsVersionWithArguments);
122+
return (ilText!, disassembleCommandAndItsVersionWithArguments!);
123123
}
124124
if (error != null)
125125
{
@@ -174,7 +174,7 @@ public DotNetDisassembleService(ConfigSettings config, ILCache? ilCache, FileDif
174174
continue;
175175
}
176176

177-
if (!AreSameDisassemblerVersion(oldResult.DisassembleCommandAndItsVersionWithArguments, newResult.DisassembleCommandAndItsVersionWithArguments))
177+
if (!AreSameDisassemblerVersion(oldResult.DisassembleCommandAndItsVersionWithArguments!, newResult.DisassembleCommandAndItsVersionWithArguments!))
178178
{
179179
lastError = new InvalidOperationException($"Disassembler version mismatch for command '{candidateDisassembleCommand}'. old='{oldResult.DisassembleCommandAndItsVersionWithArguments}', new='{newResult.DisassembleCommandAndItsVersionWithArguments}'.");
180180
continue;
@@ -183,10 +183,10 @@ public DotNetDisassembleService(ConfigSettings config, ILCache? ilCache, FileDif
183183
RecordDisassemblerUsage(candidateDisassembleCommand, oldResult.DisassembleCommandAndItsVersionWithArguments);
184184
RecordDisassemblerUsage(candidateDisassembleCommand, newResult.DisassembleCommandAndItsVersionWithArguments);
185185
return (
186-
oldResult.IlText,
187-
oldResult.DisassembleCommandAndItsVersionWithArguments,
188-
newResult.IlText,
189-
newResult.DisassembleCommandAndItsVersionWithArguments);
186+
oldResult.IlText!,
187+
oldResult.DisassembleCommandAndItsVersionWithArguments!,
188+
newResult.IlText!,
189+
newResult.DisassembleCommandAndItsVersionWithArguments!);
190190
}
191191
catch (System.ComponentModel.Win32Exception ex)
192192
{
@@ -238,7 +238,7 @@ public Task PrefetchIlCacheAsync(IEnumerable<string> dotNetAssemblyFilesAbsolute
238238
}
239239
finally
240240
{
241-
FileSystemUtility.DeleteFileSilent(tempAsciiPath);
241+
if (tempAsciiPath != null) FileSystemUtility.DeleteFileSilent(tempAsciiPath);
242242
}
243243

244244
return (Success: false, IlText: null, DisassembleCommandAndItsVersionWithArguments: null, Error: lastError);
@@ -285,7 +285,7 @@ public Task PrefetchIlCacheAsync(IEnumerable<string> dotNetAssemblyFilesAbsolute
285285
// Success — clear the blacklist state.
286286
// 正常終了したらブラックリスト状態を解除。
287287
ResetDisassembleFailure(disassembleCommand);
288-
var ilText = await ReadIlTextAfterSuccessAsync(IsIlspyCommand(disassembleCommand), argset, stdout);
288+
var ilText = await ReadIlTextAfterSuccessAsync(IsIlspyCommand(disassembleCommand), argset, stdout!);
289289
if (string.IsNullOrEmpty(label))
290290
{
291291
// On cache-miss path the label may not have been computed yet.

0 commit comments

Comments
 (0)