vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loaders: Fix possible parsing errors of informations on some NSO (#1724)

Browse Source 
This fix possible parsing errors of informations on some NSO where the "zero" field don't exist introduced by #1661 leading to crashes at start.

References:
https://github.com/Atmosphere-NX/Atmosphere/blob/master/stratosphere/creport/source/creport_modules.cpp#L202
https://github.com/Thog/oss-rtld/blob/master/source/main.cpp#L14
This commit is contained in:
Ac_K 2020-11-18 19:04:42 +01:00 committed by GitHub
parent 9435d62206
commit 7c3b559830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs
View File

@ -72,16 +72,21 @@ namespace Ryujinx.HLE.Loaders.Executables
string rawTextBuffer = Encoding.ASCII.GetString(roBuffer, 0, RoSize); string rawTextBuffer = Encoding.ASCII.GetString(roBuffer, 0, RoSize);
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
int length = BitConverter.ToInt32(roBuffer, 4); int zero = BitConverter.ToInt32(roBuffer, 0);
string moduleName = Encoding.UTF8.GetString(roBuffer, 8, length);
MatchCollection moduleMatches = Regex.Matches(rawTextBuffer, @"[a-z]:[\\/][ -~]{5,}\.nss", RegexOptions.IgnoreCase); if (zero == 0)
if (moduleMatches.Count > 0)
{ {
moduleName = moduleMatches.First().Value; int length = BitConverter.ToInt32(roBuffer, 4);
} string modulePath = Encoding.UTF8.GetString(roBuffer, 8, length);
stringBuilder.AppendLine($" Module: {moduleName}"); MatchCollection moduleMatches = Regex.Matches(rawTextBuffer, @"[a-z]:[\\/][ -~]{5,}\.nss", RegexOptions.IgnoreCase);
if (moduleMatches.Count > 0)
{
modulePath = moduleMatches.First().Value;
}
stringBuilder.AppendLine($" Module: {modulePath}");
}
MatchCollection fsSdkMatches = Regex.Matches(rawTextBuffer, @"sdk_version: ([0-9.]*)"); MatchCollection fsSdkMatches = Regex.Matches(rawTextBuffer, @"sdk_version: ([0-9.]*)");
if (fsSdkMatches.Count != 0) if (fsSdkMatches.Count != 0)
@ -98,7 +103,10 @@ namespace Ryujinx.HLE.Loaders.Executables
stringBuilder.AppendLine($"{libHeader}{libContent}"); stringBuilder.AppendLine($"{libHeader}{libContent}");
} }
Logger.Info?.Print(LogClass.Loader, $"{Name}:\n{stringBuilder.ToString().TrimEnd('\r', '\n')}"); if (stringBuilder.Length > 0)
{
Logger.Info?.Print(LogClass.Loader, $"{Name}:\n{stringBuilder.ToString().TrimEnd('\r', '\n')}");
}
} }
} }
} }