RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure `TryDisableCustomRulesetsCausing()` never actually crashes itself

This commit is contained in:
Bartłomiej Dach 2024-03-25 11:34:29 +01:00
parent fb08d6816b
commit 4979305b2d
No known key found for this signature in database
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game/Rulesets/RealmRulesetStore.cs
View File

@ -164,26 +164,33 @@ private void informUserAboutBrokenRulesets()
internal void TryDisableCustomRulesetsCausing(Exception exception)
{
var stackTrace = new StackTrace(exception);
foreach (var frame in stackTrace.GetFrames())
try
{
var declaringAssembly = frame.GetMethod()?.DeclaringType?.Assembly;
if (declaringAssembly == null)
continue;
var stackTrace = new StackTrace(exception);
if (UserRulesetAssemblies.Contains(declaringAssembly))
foreach (var frame in stackTrace.GetFrames())
{
string sourceLocation = declaringAssembly.Location;
string destinationLocation = Path.ChangeExtension(sourceLocation, @".dll.broken");
var declaringAssembly = frame.GetMethod()?.DeclaringType?.Assembly;
if (declaringAssembly == null)
continue;
if (File.Exists(sourceLocation))
if (UserRulesetAssemblies.Contains(declaringAssembly))
{
Logger.Log($"Unhandled exception traced back to custom ruleset {Path.GetFileNameWithoutExtension(sourceLocation)}. Marking as broken.");
File.Move(sourceLocation, destinationLocation);
string sourceLocation = declaringAssembly.Location;
string destinationLocation = Path.ChangeExtension(sourceLocation, @".dll.broken");
if (File.Exists(sourceLocation))
{
Logger.Log($"Unhandled exception traced back to custom ruleset {Path.GetFileNameWithoutExtension(sourceLocation)}. Marking as broken.");
File.Move(sourceLocation, destinationLocation);
}
}
}
}
catch (Exception ex)
{
Logger.Log($"Attempt to trace back crash to custom ruleset failed: {ex}");
}
}
}
}