Skip to content

fix: use-after-free in CommandQueue delete methods #419

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

Closed
mfazekas wants to merge 1 commit into from
Closed

fix: use-after-free in CommandQueue delete methods #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 0 additions & 61 deletions Source/Experimental/CommandQueue/RiveCommandQueue.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,16 +1169,6 @@ - (uint64_t)loadFile:(nonnull NSData*)data
- (void)deleteFile:(uint64_t)file requestID:(uint64_t)requestID
{
[self executeCommand:^{
// Clean up the file listener
NSValue* listenerValue = self->_fileListeners[@(file)];
if (listenerValue)
{
_FileListener* listener =
static_cast<_FileListener*>(listenerValue.pointerValue);
delete listener;
[self->_fileListeners removeObjectForKey:@(file)];
}

auto handle = reinterpret_cast<rive::FileHandle>(file);
self->_commandQueue->deleteFile(handle, requestID);
}];
Expand Down Expand Up @@ -1283,16 +1273,6 @@ - (uint64_t)createArtboardNamed:(NSString*)name
- (void)deleteArtboard:(uint64_t)artboard requestID:(uint64_t)requestID
{
[self executeCommand:^{
// Remove and release the associated listener
NSValue* listenerValue = self->_artboardListeners[@(artboard)];
if (listenerValue)
{
_ArtboardListener* listener =
static_cast<_ArtboardListener*>(listenerValue.pointerValue);
delete listener;
[self->_artboardListeners removeObjectForKey:@(artboard)];
}

auto handle = reinterpret_cast<rive::ArtboardHandle>(artboard);
self->_commandQueue->deleteArtboard(handle, requestID);
}];
Expand Down Expand Up @@ -1882,19 +1862,6 @@ - (void)deleteViewModelInstance:(uint64_t)viewModelInstance
requestID:(uint64_t)requestID
{
[self executeCommand:^{
// Remove and release the associated listener
NSValue* listenerValue =
self->_viewModelInstanceListeners[@(viewModelInstance)];
if (listenerValue)
{
_ViewModelInstanceListener* listener =
static_cast<_ViewModelInstanceListener*>(
listenerValue.pointerValue);
delete listener;
[self->_viewModelInstanceListeners
removeObjectForKey:@(viewModelInstance)];
}

auto handle =
reinterpret_cast<rive::ViewModelInstanceHandle>(viewModelInstance);
self->_commandQueue->deleteViewModelInstance(handle, requestID);
Expand Down Expand Up @@ -1964,15 +1931,6 @@ - (uint64_t)decodeImage:(NSData*)data
- (void)deleteImage:(uint64_t)renderImage requestID:(uint64_t)requestID
{
[self executeCommand:^{
NSValue* listenerValue = self->_renderImageListeners[@(renderImage)];
if (listenerValue)
{
_RenderImageListener* listener =
static_cast<_RenderImageListener*>(listenerValue.pointerValue);
delete listener;
[self->_renderImageListeners removeObjectForKey:@(renderImage)];
}

auto handle = reinterpret_cast<rive::RenderImageHandle>(renderImage);
self->_commandQueue->deleteImage(handle, requestID);
}];
Expand Down Expand Up @@ -2025,15 +1983,6 @@ - (uint64_t)decodeFont:(NSData*)data
- (void)deleteFont:(uint64_t)font requestID:(uint64_t)requestID
{
[self executeCommand:^{
NSValue* listenerValue = self->_fontListeners[@(font)];
if (listenerValue)
{
_FontListener* listener =
static_cast<_FontListener*>(listenerValue.pointerValue);
delete listener;
[self->_fontListeners removeObjectForKey:@(font)];
}

auto handle = reinterpret_cast<rive::FontHandle>(font);
self->_commandQueue->deleteFont(handle, requestID);
}];
Expand Down Expand Up @@ -2086,15 +2035,6 @@ - (uint64_t)decodeAudio:(NSData*)data
- (void)deleteAudio:(uint64_t)audio requestID:(uint64_t)requestID
{
[self executeCommand:^{
NSValue* listenerValue = self->_audioListeners[@(audio)];
if (listenerValue)
{
_AudioListener* listener =
static_cast<_AudioListener*>(listenerValue.pointerValue);
delete listener;
[self->_audioListeners removeObjectForKey:@(audio)];
}

auto handle = reinterpret_cast<rive::AudioSourceHandle>(audio);
self->_commandQueue->deleteAudio(handle, requestID);
}];
Expand Down Expand Up @@ -2314,7 +2254,6 @@ - (uint64_t)executeCommandWithReturn:(uint64_t (^)(void))commandBlock
*/
- (void)processMessages
{
// Process messages directly since we're already on the main queue
_commandQueue->processMessages();
}

Expand Down