dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-16 12:09:07 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

edge case

Browse Source
This commit is contained in:
ADEMOLA200 2025-12-03 20:01:06 +01:00
parent cc62b8236b
commit 3165bb622b
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/libraries/network/http.cpp
View File

@ -1,8 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <cctype>
#include <cstdlib>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/libraries/error_codes.h" #include "core/libraries/error_codes.h"
#include "core/libraries/libs.h" #include "core/libraries/libs.h"
@ -723,7 +721,8 @@ int PS4_SYSV_ABI sceHttpUriEscape(char* out, u64* require, u64 prepare, const ch
} }
auto IsUnreserved = [](unsigned char c) -> bool { auto IsUnreserved = [](unsigned char c) -> bool {
return std::isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~'; return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
c == '-' || c == '_' || c == '.' || c == '~';
}; };
u64 needed = 0; u64 needed = 0;
@ -743,7 +742,6 @@ int PS4_SYSV_ABI sceHttpUriEscape(char* out, u64* require, u64 prepare, const ch
*require = needed; *require = needed;
} }
// If only calculating size, return success
if (!out) { if (!out) {
return ORBIS_OK; return ORBIS_OK;
} }
@ -1139,11 +1137,31 @@ int PS4_SYSV_ABI sceHttpUriUnescape(char* out, u64* require, u64 prepare, const
return ORBIS_HTTP_ERROR_INVALID_VALUE; return ORBIS_HTTP_ERROR_INVALID_VALUE;
} }
// Locale-independent hex digit check
auto IsHex = [](char c) -> bool {
return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
};
// Convert hex char to int value
auto HexToInt = [](char c) -> int {
if (c >= '0' && c <= '9')
return c - '0';
if (c >= 'A' && c <= 'F')
return c - 'A' + 10;
if (c >= 'a' && c <= 'f')
return c - 'a' + 10;
return 0;
};
// Check for valid percent-encoded sequence (%XX)
auto IsValidPercentSequence = [&](const char* s) -> bool {
return s[0] == '%' && s[1] != '\0' && s[2] != '\0' && IsHex(s[1]) && IsHex(s[2]);
};
u64 needed = 0; u64 needed = 0;
const char* src = in; const char* src = in;
while (*src) { while (*src) {
if (*src == '%' && std::isxdigit(static_cast<unsigned char>(src[1])) && if (IsValidPercentSequence(src)) {
std::isxdigit(static_cast<unsigned char>(src[2]))) {
src += 3; src += 3;
} else { } else {
src++; src++;
@ -1156,7 +1174,6 @@ int PS4_SYSV_ABI sceHttpUriUnescape(char* out, u64* require, u64 prepare, const
*require = needed; *require = needed;
} }
// If only calculating size, return success
if (!out) { if (!out) {
return ORBIS_OK; return ORBIS_OK;
} }
@ -1169,10 +1186,8 @@ int PS4_SYSV_ABI sceHttpUriUnescape(char* out, u64* require, u64 prepare, const
src = in; src = in;
char* dst = out; char* dst = out;
while (*src) { while (*src) {
if (*src == '%' && std::isxdigit(static_cast<unsigned char>(src[1])) && if (IsValidPercentSequence(src)) {
std::isxdigit(static_cast<unsigned char>(src[2]))) { *dst++ = static_cast<char>((HexToInt(src[1]) << 4) | HexToInt(src[2]));
char hex[3] = {src[1], src[2], '\0'};
*dst++ = static_cast<char>(std::strtol(hex, nullptr, 16));
src += 3; src += 3;
} else { } else {
*dst++ = *src++; *dst++ = *src++;