steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-29 04:01:27 +01:00
Code Issues Packages Projects Releases 67 Wiki Activity

Merge pull request #1485 from Sonicadvance1/fix_fortify

Browse Source 
FEXCore: Fixes a memcpy overflow in processor brand
This commit is contained in:
Mai M authored and GitHub committed 2021-12-31 02:51:06 -05:00
2 parents 5146651908 d300181ab9
commit 340699ca33
1 file changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files
External/FEXCore/Source/Interface/Core/CPUID.cpp
Vendored
+4 -3
View File
@@ -908,7 +908,7 @@ constexpr char ProcessorBrand[32] = {
GIT_DESCRIBE_STRING
};
constexpr size_t DESCRIBE_STR_SIZE = std::char_traits<char>::length(GIT_DESCRIBE_STRING);
constexpr ssize_t DESCRIBE_STR_SIZE = std::char_traits<char>::length(GIT_DESCRIBE_STRING);
static_assert(DESCRIBE_STR_SIZE < 32);
//Processor brand string
@@ -926,14 +926,15 @@ FEXCore::CPUID::FunctionResults CPUIDEmu::Function_8000_0004h(uint32_t Leaf) {
FEXCore::CPUID::FunctionResults CPUIDEmu::Function_8000_0002h(uint32_t Leaf, uint32_t CPU) {
FEXCore::CPUID::FunctionResults Res{};
memcpy(&Res, &ProcessorBrand[0], sizeof(FEXCore::CPUID::FunctionResults));
memset(&Res, ' ', sizeof(FEXCore::CPUID::FunctionResults));
memcpy(&Res, &ProcessorBrand[0], DESCRIBE_STR_SIZE);
return Res;
}
FEXCore::CPUID::FunctionResults CPUIDEmu::Function_8000_0003h(uint32_t Leaf, uint32_t CPU) {
FEXCore::CPUID::FunctionResults Res{};
memset(&Res, ' ', sizeof(FEXCore::CPUID::FunctionResults));
memcpy(&Res, &ProcessorBrand[16], DESCRIBE_STR_SIZE - 16);
memcpy(&Res, &ProcessorBrand[16], std::max(0L, DESCRIBE_STR_SIZE - 16));
return Res;
}