Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixes some issue with sceUriParse

Browse source
This commit is contained in:
ANR2ME 2023-09-03 07:37:37 +07:00 • committed by Henrik Rydgård
parent 07f3249af5
commit e6aa667eea
1 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
Core/HLE/sceParseUri.cpp
View file

@ -38,27 +38,26 @@ int workAreaAddString(u32 workAreaAddr, int workAreaSize, int offset, const char
return offset + length;
}
// FIXME: parsedUriArea, workArea, and workAreaSizeAddr can be 0/null?
// FIXME: parsedUriArea, workArea can be 0/null? LittelBigPlanet seems to set workAreaSizeAddr to 0
static int sceUriParse(u32 parsedUriAreaAddr, const char* url, u32 workAreaAddr, u32 workAreaSizeAddr, int workAreaSize) {
WARN_LOG(Log::sceNet, "UNTESTED sceUriParse(%x, %s, %x, %x, %d) at %08x", parsedUriAreaAddr, safe_string(url), workAreaAddr, workAreaSizeAddr, workAreaSize, currentMIPS->pc);
if (url == nullptr)
return hleLogError(Log::sceNet, -1, "invalid arg");
if (!Memory::IsValidRange(workAreaSizeAddr, 4))
return hleLogError(Log::sceNet, -1, "invalid arg");
auto workAreaSz = PSPPointer<u32>::Create(workAreaSizeAddr);
// Size returner
if (parsedUriAreaAddr == 0 || workAreaAddr == 0) {
// Based on JPCSP: The required workArea size if maximum the size if the URL + 7 times the null-byte for string termination.
int urllen = (int)strlen(url);
Memory::WriteUnchecked_U32(urllen + 7, workAreaSizeAddr);
NotifyMemInfo(MemBlockFlags::WRITE, workAreaSizeAddr, 4, "UriParse");
return hleLogSuccessI(Log::sceNet, 0, "workAreaSize: %d, %d", urllen + 7, workAreaSize);
// Based on JPCSP: The required workArea size is maximum the size of the URL + 7 times the null-byte for string termination.
int sz = (int)strlen(url) + 7;
if (workAreaSz.IsValid()) {
*workAreaSz = sz;
workAreaSz.NotifyWrite("UriParse");
}
return hleLogSuccessI(Log::sceNet, 0, "workAreaSize: %d, %d", sz, workAreaSize);
}
auto parsedUri = PSPPointer<PSPParsedUri>::Create(parsedUriAreaAddr);
if (!parsedUri.IsValid())
return hleLogError(Log::sceNet, -1, "invalid arg");
// Parse the URL into URI components
// Full URI = scheme ":" ["//" [username [":" password] "@"] host [":" port]] path ["?" query] ["#" fragment]
@ -106,37 +105,50 @@ static int sceUriParse(u32 parsedUriAreaAddr, const char* url, u32 workAreaAddr,
// FIXME: Related to "scheme-specific-part" (ie. parts after the scheme + ":") ? 0 = start with "//"
pos = std::string(url).find("://");
parsedUri->noSlash = (pos != std::string::npos) ? 0 : 1;
if (parsedUri.IsValid())
parsedUri->noSlash = (pos != std::string::npos) ? 0 : 1;
// Store the URI components in sequence into workAreanand store the respective addresses into the parsedUri structure.
int offset = 0;
parsedUri->schemeAddr = workAreaAddr + offset;
if (parsedUri.IsValid())
parsedUri->schemeAddr = workAreaAddr + offset;
offset = workAreaAddString(workAreaAddr, workAreaSize, offset, uri.Protocol().c_str()); // FiXME: scheme in lowercase, while protocol in uppercase?
parsedUri->userInfoUserNameAddr = workAreaAddr + offset;
if (parsedUri.IsValid())
parsedUri->userInfoUserNameAddr = workAreaAddr + offset;
offset = workAreaAddString(workAreaAddr, workAreaSize, offset, userInfoUserName.c_str());
parsedUri->userInfoPasswordAddr = workAreaAddr + offset;
if (parsedUri.IsValid())
parsedUri->userInfoPasswordAddr = workAreaAddr + offset;
offset = workAreaAddString(workAreaAddr, workAreaSize, offset, userInfoPassword.c_str());
parsedUri->hostAddr = workAreaAddr + offset;
if (parsedUri.IsValid())
parsedUri->hostAddr = workAreaAddr + offset;
offset = workAreaAddString(workAreaAddr, workAreaSize, offset, host.c_str());
parsedUri->pathAddr = workAreaAddr + offset;
if (parsedUri.IsValid())
parsedUri->pathAddr = workAreaAddr + offset;
offset = workAreaAddString(workAreaAddr, workAreaSize, offset, path.c_str());
parsedUri->queryAddr = workAreaAddr + offset;
if (parsedUri.IsValid())
parsedUri->queryAddr = workAreaAddr + offset;
offset = workAreaAddString(workAreaAddr, workAreaSize, offset, query.c_str());
parsedUri->fragmentAddr = workAreaAddr + offset;
if (parsedUri.IsValid())
parsedUri->fragmentAddr = workAreaAddr + offset;
offset = workAreaAddString(workAreaAddr, workAreaSize, offset, fragment.c_str());
parsedUri->port = uri.Port();
memset(parsedUri->unknown, 0, sizeof(parsedUri->unknown));
parsedUri.NotifyWrite("UriParse");
if (parsedUri.IsValid()) {
parsedUri->port = uri.Port();
memset(parsedUri->unknown, 0, sizeof(parsedUri->unknown));
parsedUri.NotifyWrite("UriParse");
}
Memory::WriteUnchecked_U32(offset, workAreaSizeAddr);
NotifyMemInfo(MemBlockFlags::WRITE, workAreaSizeAddr, 4, "UriParse");
// Update the size
if (workAreaSz.IsValid()) {
*workAreaSz = offset;
workAreaSz.NotifyWrite("UriParse");
}
return 0;
}