asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #76747 from RandomShaper/fix_mq_redundant

Browse source 
Mend some checks in CallQueue
This commit is contained in:
Rémi Verschelde 2023-05-08 12:20:45 +02:00
commit 0daa634f24
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/object/message_queue.cpp
View file

@ -62,15 +62,16 @@ Error CallQueue::push_set(Object *p_object, const StringName &p_prop, const Vari
} }
Error CallQueue::push_callablep(const Callable &p_callable, const Variant **p_args, int p_argcount, bool p_show_error) { Error CallQueue::push_callablep(const Callable &p_callable, const Variant **p_args, int p_argcount, bool p_show_error) {
mutex.lock();
uint32_t room_needed = sizeof(Message) + sizeof(Variant) * p_argcount; uint32_t room_needed = sizeof(Message) + sizeof(Variant) * p_argcount;
ERR_FAIL_COND_V_MSG(room_needed > uint32_t(PAGE_SIZE_BYTES), ERR_INVALID_PARAMETER, "Message is too large to fit on a page (" + itos(PAGE_SIZE_BYTES) + " bytes), consider passing less arguments."); ERR_FAIL_COND_V_MSG(room_needed > uint32_t(PAGE_SIZE_BYTES), ERR_INVALID_PARAMETER, "Message is too large to fit on a page (" + itos(PAGE_SIZE_BYTES) + " bytes), consider passing less arguments.");
mutex.lock();
_ensure_first_page(); _ensure_first_page();
if ((page_offset + room_needed) > uint32_t(PAGE_SIZE_BYTES)) { if ((page_offset + room_needed) > uint32_t(PAGE_SIZE_BYTES)) {
if (room_needed > uint32_t(PAGE_SIZE_BYTES) || pages_used == max_pages) { if (pages_used == max_pages) {
ERR_PRINT("Failed method: " + p_callable + ". Message queue out of memory. " + error_text); ERR_PRINT("Failed method: " + p_callable + ". Message queue out of memory. " + error_text);
statistics(); statistics();
mutex.unlock(); mutex.unlock();