Răsfoiți Sursa

Merge branch 'bugfix/provisioning_not_stopping' into 'master'

wifi_prov_mgr: Fix provisioning not stopping in release mode

Closes IDFGH-6679

See merge request espressif/esp-idf!16996
Mahavir Jain 4 ani în urmă
părinte
comite
7eefd5241f

+ 9 - 15
components/wifi_provisioning/src/manager.c

@@ -1,16 +1,8 @@
-// Copyright 2019 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: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #include <string.h>
 #include <sys/param.h>
@@ -623,8 +615,10 @@ static bool wifi_prov_mgr_stop_service(bool blocking)
          * released - some duration after - returning from a call to
          * wifi_prov_mgr_stop_provisioning(), like when it is called
          * inside a protocomm handler */
-        assert(xTaskCreate(prov_stop_task, "prov_stop_task", 4096, (void *)1,
-                           tskIDLE_PRIORITY, NULL) == pdPASS);
+        if (xTaskCreate(prov_stop_task, "prov_stop_task", 4096, (void *)1, tskIDLE_PRIORITY, NULL) != pdPASS) {
+            ESP_LOGE(TAG, "Failed to create prov_stop_task!");
+            abort();
+        }
         ESP_LOGD(TAG, "Provisioning scheduled for stopping");
     }
     return true;

+ 0 - 1
tools/ci/check_copyright_ignore.txt

@@ -2099,7 +2099,6 @@ components/wifi_provisioning/python/wifi_config_pb2.py
 components/wifi_provisioning/python/wifi_constants_pb2.py
 components/wifi_provisioning/python/wifi_scan_pb2.py
 components/wifi_provisioning/src/handlers.c
-components/wifi_provisioning/src/manager.c
 components/wifi_provisioning/src/scheme_console.c
 components/wifi_provisioning/src/wifi_config.c
 components/wifi_provisioning/src/wifi_provisioning_priv.h