Merge pull request #2616 from oneandonlydean/fix/carry-2556

fix: skip zero-length memcpy calls
This commit is contained in:
Adrià 2026-10-10 10:50:12 +02:00 committed by GitHub
commit 68587c34db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -298,7 +298,7 @@ int APS5_VABI sceHttpUriParse(SceHttpUriElement* out, const char* src_url, void*
char* strings[7];
for (size_t i = 0; i < 7; ++i) {
strings[i] = next;
std::memcpy(next, fields[i].data(), fields[i].size());
if (!fields[i].empty()) std::memcpy(next, fields[i].data(), fields[i].size());
next[fields[i].size()] = '\0';
next += fields[i].size() + 1;
}

View File

@ -44,7 +44,7 @@ std::int64_t APS5_VABI readlink_nid_postfix(const char* path, char* buffer, std:
if (error) return Fail(GuestError(error));
const auto count = std::min(size, target.size());
if (count != 0 && buffer == nullptr) return Fail(GuestEfault);
std::memcpy(buffer, target.data(), count);
if (count != 0) std::memcpy(buffer, target.data(), count);
return static_cast<std::int64_t>(count);
}