alexx009/jinx
Archived
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

ContentServices: Handle null LocationEntry Path in VerifyContentType (#506)

Browse source 
When `LocationEntry.ContentPath` is `null`, we can always return `false` as it can't possibly be a valid `ContentType`
This commit is contained in:
jduncanator 2018-11-19 11:20:17 +11:00 committed by Ac_K
parent fe8fbb6fb9
commit 26e09474a9
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Ryujinx.HLE/FileSystem/Content/ContentManager.cs
View file

@ -223,6 +223,11 @@ namespace Ryujinx.HLE.FileSystem.Content
private bool VerifyContentType(LocationEntry LocationEntry, ContentType ContentType) private bool VerifyContentType(LocationEntry LocationEntry, ContentType ContentType)
{ {
if (LocationEntry.ContentPath == null)
{
return false;
}
StorageId StorageId = LocationHelper.GetStorageId(LocationEntry.ContentPath); StorageId StorageId = LocationHelper.GetStorageId(LocationEntry.ContentPath);
string InstalledPath = Device.FileSystem.SwitchPathToSystemPath(LocationEntry.ContentPath); string InstalledPath = Device.FileSystem.SwitchPathToSystemPath(LocationEntry.ContentPath);

1
Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
View file

@ -78,6 +78,7 @@ namespace Ryujinx.HLE.FileSystem
{ {
return null; return null;
} }
return GetFullPath(MakeDirAndGetFullPath(Parts[0]), Parts[1]); return GetFullPath(MakeDirAndGetFullPath(Parts[0]), Parts[1]);
} }