Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-07 06:50:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

misc: Tweak NullReferenceException fixes

Browse Source
This commit is contained in:
KeatonTheBot
2025-11-23 13:43:15 -06:00
parent 35bced8527
commit 377805579b
23 changed files with 143 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx.HLE/HOS/Kernel/Ipc/KServerPort.cs
+2 -5
View File
@@ -60,12 +60,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
KernelContext.CriticalSection.Enter();
if (list.Count != 0)
if (list.Count != 0 && list.First != null)
{
if (list.First != null)
{
session = list.First.Value;
}
session = list.First.Value;
list.RemoveFirst();
}
src/Ryujinx.HLE/HOS/Kernel/Memory/SharedMemoryStorage.cs
+3 -6
View File
@@ -32,13 +32,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
public ref T GetRef<T>(ulong offset) where T : unmanaged
{
if (_pageList.Nodes.Count == 1)
if (_pageList.Nodes.Count == 1 && _pageList.Nodes.First != null)
{
if (_pageList.Nodes.First != null)
{
ulong address = _pageList.Nodes.First.Value.Address - DramMemoryMap.DramBase;
return ref _context.Memory.GetRef<T>(address + offset);
}
ulong address = _pageList.Nodes.First.Value.Address - DramMemoryMap.DramBase;
return ref _context.Memory.GetRef<T>(address + offset);
}
throw new NotImplementedException("Non-contiguous shared memory is not yet supported.");
src/Ryujinx.HLE/HOS/Services/Nv/NvMemoryAllocator.cs
+11 -5
View File
@@ -164,8 +164,11 @@ namespace Ryujinx.HLE.HOS.Services.Nv
Logger.Debug?.Print(LogClass.ServiceNv, $"Deallocation resulted in new free range from 0x{expandedStart:X} to 0x{expandedEnd:X}.");
_tree.Add(expandedStart, expandedEnd);
LinkedListNode<ulong> nodePtr = _list.AddAfter(node, expandedStart);
_dictionary[expandedStart] = nodePtr;
if (node != null)
{
LinkedListNode<ulong> nodePtr = _list.AddAfter(node, expandedStart);
_dictionary[expandedStart] = nodePtr;
}
}
}
}
@@ -196,11 +199,14 @@ namespace Ryujinx.HLE.HOS.Services.Nv
if (address < AddressSpaceSize)
{
bool reachedEndOfAddresses = false;
ulong targetAddress;
ulong targetAddress = 0;
if (start == DefaultStart)
{
Logger.Debug?.Print(LogClass.ServiceNv, $"Target address set to start of the last available range: 0x{_list.Last.Value:X}.");
targetAddress = _list.Last.Value;
if (_list.Last != null)
{
Logger.Debug?.Print(LogClass.ServiceNv, $"Target address set to start of the last available range: 0x{_list.Last.Value:X}.");
targetAddress = _list.Last.Value;
}
}
else
{
src/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs
+2 -2
View File
@@ -97,8 +97,8 @@ namespace Ryujinx.HLE.HOS.Services.Sm
IpcService service = GetServiceInstance(type, context, serviceAttribute.Parameter);
service.TrySetServer(_commonServer);
service.Server.AddSessionObj(session.ServerSession, service);
service?.TrySetServer(_commonServer);
service?.Server.AddSessionObj(session.ServerSession, service);
}
else
{