feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

nvs_flash: replace strncpy + manual null termination with strlcpy

Browse Source 
Since libbsd is now a build dependency on Linux, strncpy can be
replaced with the safer and less verbose strlcpy.
This commit is contained in:
Ivan Grokhotkov
2022-08-15 23:29:25 +02:00
parent bee241b0e2
commit 7a1e19edf1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/nvs_flash/src/nvs_storage.cpp
View File

@@ -4,6 +4,10 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include "nvs_storage.hpp" #include "nvs_storage.hpp"
#if __has_include(<bsd/string.h>)
// for strlcpy
#include <bsd/string.h>
#endif
#ifndef ESP_PLATFORM #ifndef ESP_PLATFORM
// We need NO_DEBUG_STORAGE here since the integration tests on the host add some debug code. // We need NO_DEBUG_STORAGE here since the integration tests on the host add some debug code.
@@ -755,11 +759,7 @@ void Storage::fillEntryInfo(Item &item, nvs_entry_info_t &info)
for (auto &name : mNamespaces) { for (auto &name : mNamespaces) {
if(item.nsIndex == name.mIndex) { if(item.nsIndex == name.mIndex) {
#pragma GCC diagnostic push strlcpy(info.namespace_name, name.mName, sizeof(info.namespace_name));
#pragma GCC diagnostic ignored "-Wstringop-truncation"
strncpy(info.namespace_name, name.mName, sizeof(info.namespace_name) - 1);
#pragma GCC diagnostic pop
info.namespace_name[sizeof(info.namespace_name) -1] = '\0';
break; break;
} }
} }