RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:17:34 +00:00
Code Issues Activity Actions

LibVideo: Do not invoke Vector2D's destructor in order to resize it

Browse source 
This leads to all kinds of undefined behavior, especially when callers
have a view into the Vector2D.
This commit is contained in:
Timothy Flynn 2023-04-24 11:25:14 -04:00 • committed by Andreas Kling
parent 683c8284cf
commit 8b7c5db186
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibVideo/VP9/ContextStorage.h
View file

@ -103,17 +103,14 @@ class Vector2D {
public: public:
~Vector2D() ~Vector2D()
{ {
if (m_storage) clear_storage();
free(m_storage);
m_storage = nullptr;
m_width = 0;
m_height = 0;
} }
ErrorOr<void> try_resize(u32 height, u32 width) ErrorOr<void> try_resize(u32 height, u32 width)
{ {
if (height != m_height && width != m_width) { if (height != m_height && width != m_width) {
this->~Vector2D(); clear_storage();
size_t size = height * width; size_t size = height * width;
auto* new_storage = static_cast<T*>(malloc(size * sizeof(T))); auto* new_storage = static_cast<T*>(malloc(size * sizeof(T)));
if (!new_storage) if (!new_storage)
@ -195,6 +192,15 @@ public:
} }
private: private:
void clear_storage()
{
if (m_storage)
free(m_storage);
m_storage = nullptr;
m_width = 0;
m_height = 0;
}
u32 m_height { 0 }; u32 m_height { 0 };
u32 m_width { 0 }; u32 m_width { 0 };
T* m_storage { nullptr }; T* m_storage { nullptr };