Skip to content

Commit 0f14e26

Browse files
authored
Merge pull request #1055 from david-cermak/fix/modem_hardening2
[modem]: Additional hardening (uart/netif)
2 parents e0e2031 + 9176fa6 commit 0f14e26

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

components/esp_modem/src/esp_modem_netif.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ void Netif::pause()
120120

121121
Netif::~Netif()
122122
{
123+
ppp_dte->set_read_cb(nullptr);
123124
if (signal.is_any(PPP_STARTED)) {
124125
esp_netif_action_stop(driver.base.netif, nullptr, 0, nullptr);
125126
signal.clear(PPP_STARTED);

components/esp_modem/src/esp_modem_uart.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ int UartTerminal::read(uint8_t *data, size_t len)
177177
length = std::min(len, length);
178178
if (length > 0) {
179179
int read_len = uart_read_bytes(uart.port, data, length, portMAX_DELAY);
180+
if (read_len < 0) {
181+
ESP_LOGE(TAG, "Error occurred during read: %d", read_len);
182+
return 0;
183+
}
180184
#if CONFIG_ESP_MODEM_ADD_DEBUG_LOGS
181185
ESP_LOG_BUFFER_HEXDUMP("uart-rx", data, read_len, ESP_LOG_DEBUG);
182186
#endif

0 commit comments

Comments
 (0)