alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix DCE deferencing crash in pppos example

Browse Source 
Merges https://github.com/espressif/esp-idf/pull/7439
This commit is contained in:
Marco Gigante 2021-08-18 17:49:59 +02:00 committed by David Cermak
parent e35a87f723
commit b40b22c136
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
examples/protocols/pppos_client/components/modem/src/esp_modem.c
View File

@ -1,16 +1,8 @@
// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
@ -242,7 +234,7 @@ static esp_err_t esp_modem_dte_send_cmd(modem_dte_t *dte, const char *command, u
esp_err_t ret = ESP_FAIL;
modem_dce_t *dce = dte->dce;
ESP_LOGD(MODEM_TAG, "Sending command:%s", command);
MODEM_CHECK(dce, "DTE has not yet bind with DCE", err);
MODEM_CHECK(dce, "DTE has not yet bind with DCE", errdce);
MODEM_CHECK(command, "command is NULL", err);
esp_modem_dte_t *esp_dte = __containerof(dte, esp_modem_dte_t, parent);
esp_dte->consumed = 0;
@ -256,6 +248,7 @@ static esp_err_t esp_modem_dte_send_cmd(modem_dte_t *dte, const char *command, u
ret = ESP_OK;
err:
dce->handle_line = NULL;
errdce:
return ret;
}

1
tools/ci/check_copyright_ignore.txt
View File

@ -3821,7 +3821,6 @@ examples/protocols/pppos_client/components/modem/include/esp_modem_netif.h
examples/protocols/pppos_client/components/modem/include/sim7600.h
examples/protocols/pppos_client/components/modem/include/sim800.h
examples/protocols/pppos_client/components/modem/src/bg96.c
examples/protocols/pppos_client/components/modem/src/esp_modem.c
examples/protocols/pppos_client/components/modem/src/esp_modem_compat.c
examples/protocols/pppos_client/components/modem/src/esp_modem_dce_service.c
examples/protocols/pppos_client/components/modem/src/esp_modem_netif.c