diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 18c8cfb35c..2b3da424ef 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -754,13 +754,34 @@ static u32 sysclib_memset(u32 destAddr, int data, int size) { static int sysclib_strstr(u32 s1, u32 s2) { ERROR_LOG(SCEKERNEL, "Untested sysclib_strstr(%08x, %08x)", s1, s2); - std::string str1 = Memory::GetCharPointer(s1); - std::string str2 = Memory::GetCharPointer(s2); - size_t index = str1.find(str2); - if (index == str1.npos) { - return 0; + if (Memory::IsValidAddress(s1) && Memory::IsValidAddress(s2)) { + std::string str1 = Memory::GetCharPointer(s1); + std::string str2 = Memory::GetCharPointer(s2); + size_t index = str1.find(str2); + if (index == str1.npos) { + return 0; + } + return s1 + (uint32_t)index; } - return s1 + (uint32_t)index; + return 0; +} + +static int sysclib_strncmp(u32 s1, u32 s2, u32 size) { + ERROR_LOG(SCEKERNEL, "Untested sysclib_strncmp(%08x, %08x, x)", s1, s2, size); + if (Memory::IsValidAddress(s1) && Memory::IsValidAddress(s2)) { + const char * str1 = Memory::GetCharPointer(s1); + const char * str2 = Memory::GetCharPointer(s2); + return strncmp(str1, str2, size); + } + return 0; +} + +static u32 sysclib_memmove(u32 dst, u32 src, u32 size) { + ERROR_LOG(SCEKERNEL, "Untested sysclib_memmove(%08x, %08x, x)", dst, src, size); + if (Memory::IsValidRange(dst, size) && Memory::IsValidRange(src, size)) { + memmove(Memory::GetPointer(dst), Memory::GetPointer(src), size); + } + return 0; } const HLEFunction SysclibForKernel[] = @@ -774,6 +795,8 @@ const HLEFunction SysclibForKernel[] = {0x7661E728, &WrapI_UU, "sprintf", 'i', "xx", HLE_KERNEL_SYSCALL }, {0x10F3BB61, &WrapU_UII, "memset", 'x', "xii", HLE_KERNEL_SYSCALL }, {0x0D188658, &WrapI_UU, "strstr", 'i', "xx", HLE_KERNEL_SYSCALL }, + {0x7AB35214, &WrapI_UUU, "strncmp", 'i', "xxx", HLE_KERNEL_SYSCALL }, + {0xA48D2592, &WrapU_UUU, "memmove", 'x', "xxx", HLE_KERNEL_SYSCALL }, }; void Register_Kernel_Library()