Skip to content

fix(ppp): Fix PPP.end() causing exception #11987

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

Merged
merged 2 commits into from
Nov 6, 2025
+36 −4
Merged

fix(ppp): Fix PPP.end() causing exception #11987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8da66b
fix(ppp): Fix PPP.end() causing exception
me-no-dev Nov 5, 2025
87a8345
fix(periman): Return NULL if deinit callback is cleared
me-no-dev Nov 5, 2025
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
19 changes: 19 additions & 0 deletions cores/esp32/esp32-hal-periman.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,30 @@ bool perimanSetBusDeinit(peripheral_bus_type_t type, peripheral_bus_deinit_cb_t
return true;
}

// This no-op callback is used by perimanClearBusDeinit() to effectively disable bus deinit functionality
// without setting the callback to NULL, which would cause errors in perimanSetPinBus() at line 146.
static bool empty_bus_deinit_cb(void *bus) {
return true;
}

bool perimanClearBusDeinit(peripheral_bus_type_t type) {
if (type >= ESP32_BUS_TYPE_MAX || type == ESP32_BUS_TYPE_INIT) {
log_e("Invalid type: %s (%u)", perimanGetTypeName(type), (unsigned int)type);
return false;
}
deinit_functions[type] = empty_bus_deinit_cb;
log_v("Deinit function for type %s (%u) cleared", perimanGetTypeName(type), (unsigned int)type);
return true;
}

peripheral_bus_deinit_cb_t perimanGetBusDeinit(peripheral_bus_type_t type) {
if (type >= ESP32_BUS_TYPE_MAX || type == ESP32_BUS_TYPE_INIT) {
log_e("Invalid type: %s (%u)", perimanGetTypeName(type), (unsigned int)type);
return NULL;
}
if (deinit_functions[type] == empty_bus_deinit_cb) {
return NULL;
}
return deinit_functions[type];
}

Expand Down
3 changes: 3 additions & 0 deletions cores/esp32/esp32-hal-periman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ int8_t perimanGetPinBusChannel(uint8_t pin);
// Sets the peripheral destructor callback. Used to destroy bus when pin is assigned another function
bool perimanSetBusDeinit(peripheral_bus_type_t type, peripheral_bus_deinit_cb_t cb);

// Clears the peripheral destructor callback
bool perimanClearBusDeinit(peripheral_bus_type_t type);

// Get the peripheral destructor callback. It allows changing/restoring the peripheral pin function detaching, if necessary
// returns NULL if none is set
peripheral_bus_deinit_cb_t perimanGetBusDeinit(peripheral_bus_type_t type);
Expand Down
18 changes: 14 additions & 4 deletions libraries/PPP/src/PPP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,11 @@ void PPPClass::end(void) {
Network.postEvent(&arduino_event);
}

if (_dce != NULL) {
esp_modem_destroy(_dce);
_dce = NULL;
}

destroyNetif();

if (_ppp_ev_instance != NULL) {
Expand All @@ -406,10 +411,10 @@ void PPPClass::end(void) {
Network.removeEvent(_ppp_event_handle);
_ppp_event_handle = 0;

if (_dce != NULL) {
esp_modem_destroy(_dce);
_dce = NULL;
}
perimanClearBusDeinit(ESP32_BUS_TYPE_PPP_TX);
perimanClearBusDeinit(ESP32_BUS_TYPE_PPP_RX);
perimanClearBusDeinit(ESP32_BUS_TYPE_PPP_RTS);
perimanClearBusDeinit(ESP32_BUS_TYPE_PPP_CTS);

int8_t pin = -1;
if (_pin_tx != -1) {
Expand Down Expand Up @@ -438,6 +443,11 @@ void PPPClass::end(void) {
perimanClearPinBus(pin);
}

perimanSetBusDeinit(ESP32_BUS_TYPE_PPP_TX, PPPClass::pppDetachBus);
perimanSetBusDeinit(ESP32_BUS_TYPE_PPP_RX, PPPClass::pppDetachBus);
perimanSetBusDeinit(ESP32_BUS_TYPE_PPP_RTS, PPPClass::pppDetachBus);
perimanSetBusDeinit(ESP32_BUS_TYPE_PPP_CTS, PPPClass::pppDetachBus);

_mode = ESP_MODEM_MODE_COMMAND;
}

Expand Down
Loading