espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/usleep_overflow_v5.2' into 'release/v5.2'

Browse Source 
fix(newlib): fixed potential overflow in usleep (v5.2)

See merge request espressif/esp-idf!33002
This commit is contained in:
Jiang Jiang Jian
2024-08-23 10:27:38 +08:00
parent 149c0e24db f6a6ef641c
commit 303690e981
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/newlib/time.c
View File

@@ -194,7 +194,10 @@ int settimeofday(const struct timeval *tv, const struct timezone *tz)
int usleep(useconds_t us) int usleep(useconds_t us)
{ {
const int us_per_tick = portTICK_PERIOD_MS * 1000; /* Even at max tick rate, vTaskDelay can still delay for the max of the us argument,
we just need to make sure the tick calculation does not overflow
*/
const int64_t us_per_tick = portTICK_PERIOD_MS * 1000;
if (us < us_per_tick) { if (us < us_per_tick) {
esp_rom_delay_us((uint32_t) us); esp_rom_delay_us((uint32_t) us);
} else { } else {