arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

scheduled function: replacing new by malloc needs to initialize complex members (#6233)

Browse Source 
* scheduled function: replacing new by malloc needs to initialize complex members

Functional was not initialized because of malloc() instead of new.
First assignment calls destructor on initial value which was not constructed (->frozen,wdt).
This commit is contained in:
david gauchard 2019-06-26 15:18:07 +02:00 committed by GitHub
parent 909a9c4f4c
commit b94ea923b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cores/esp8266/Schedule.cpp
View File

@ -41,14 +41,18 @@ static scheduled_fn_t* get_fn_unsafe ()
{
result = sUnused;
sUnused = sUnused->mNext;
result->mNext = nullptr;
}
// if no unused items, and count not too high, allocate a new one
else if (sCount < SCHEDULED_FN_MAX_COUNT)
{
// calling malloc instead of new to avoid exception raising while in ISR
// construct complex members in place (never raises exceptions)
result = (scheduled_fn_t*)malloc(sizeof(scheduled_fn_t));
if (result)
{
new (&result->mFunc) decltype(result->mFunc)();
++sCount;
}
}
return result;
}
@ -70,6 +74,7 @@ bool schedule_function (const std::function<void(void)>& fn)
return false;
item->mFunc = fn;
item->mNext = nullptr;
if (sFirst)
sLast->mNext = item;