Skip to content

Add bounds check when allocating TweakDB data #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wopss merged 3 commits into from
Jul 30, 2026
Merged

Add bounds check when allocating TweakDB data #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eda5627
Add bounds check when allocating TweakDB data
psiberx Jul 28, 2026
bd722fa
Fix compilation for C++20
psiberx Jul 28, 2026
6ea7425
Fix formatting
psiberx Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/RED4ext/NativeTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ struct Variant
Variant(CName aTypeName);
Variant(CName aTypeName, const void* aData);
template<typename T>
requires !std::derived_from<std::remove_pointer_t<std::decay_t<T>>, rtti::IType>
Variant(const T& acValue)
requires(!std::derived_from<std::remove_pointer_t<std::decay_t<T>>, rtti::IType>)
Variant(const T& acValue)
: Variant(GetTypeName<T>(), std::addressof(acValue))
{
}
Expand Down Expand Up @@ -290,7 +290,7 @@ struct Variant
{
// TODO: support all game types and user types using RedLib solution:
// https://github.com/psiberx/cp2077-red-lib/blob/master/include/Red/TypeInfo/Resolving.hpp
static_assert(false, "Type is currently unsupported.");
static_assert(!std::is_same_v<T, T>, "Type is currently unsupported.");
return "";
}
}
Expand Down
17 changes: 10 additions & 7 deletions include/RED4ext/TweakDB-inl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,17 +324,20 @@ RED4EXT_INLINE int32_t RED4ext::TweakDB::CreateFlatValue(const CStackType& aStac

UpsizeFlatDataBuffer(MaxFlatDataBufferSize);

uintptr_t flatAlignment = (std::max)(aStackType.type->GetAlignment(), 8u);
uintptr_t flatValueSize = RED4ext::AlignUp(8ull /* vftable */ + aStackType.type->GetSize(), flatAlignment);
uintptr_t flatDataBufferEnd_Aligned = RED4ext::AlignUp(flatDataBufferEnd, flatAlignment);
const uintptr_t flatAlignment = (std::max)(aStackType.type->GetAlignment(), 8u);
const uintptr_t flatValueSize = RED4ext::AlignUp(8ull /* vftable */ + aStackType.type->GetSize(), flatAlignment);
const uintptr_t flatAddressAligned = RED4ext::AlignUp(flatDataBufferEnd, flatAlignment);
const uintptr_t newFlatDataBufferEnd = flatAddressAligned + flatValueSize;

if (AllocateFlatValue(reinterpret_cast<void*>(flatDataBufferEnd_Aligned), aStackType))
if (newFlatDataBufferEnd > (flatDataBuffer + flatDataBufferCapacity) ||
!AllocateFlatValue(reinterpret_cast<void*>(flatAddressAligned), aStackType))
{
flatDataBufferEnd = flatDataBufferEnd_Aligned + flatValueSize;
return reinterpret_cast<FlatValue*>(flatDataBufferEnd_Aligned)->ToTDBOffset();
return -1;
}

return -1;
flatDataBufferEnd = newFlatDataBufferEnd;

return reinterpret_cast<FlatValue*>(flatAddressAligned)->ToTDBOffset();
}

RED4EXT_INLINE bool RED4ext::TweakDB::AllocateFlatValue(void* aBuffer, const CStackType& aStackType)
Expand Down
Loading