ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-18 01:11:42 +10:00
Code Releases Activity

Address review validation nits

Browse Source 
Agent-Logs-Url: https://github.com/meshtastic/firmware/sessions/6b1d6cf6-ed6b-43b6-95cb-8e141757664e

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-05-09 02:23:46 +00:00
committed by GitHub
co-authored by thebentern
parent ebc5b63035
commit 796d4552f9
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesh/NodeDB.cpp
+2 -2
View File
@@ -1505,7 +1505,7 @@ LoadFileResult NodeDB::loadProto(const char *filename, size_t protoSize, size_t
LOG_INFO("Load %s", filename);
pb_istream_t stream = {&readcb, &f, protoSize};
if (fields != &meshtastic_NodeDatabase_msg &&
fields != &meshtastic_NodeDatabase_Legacy_msg) // contains a vector object
fields != &meshtastic_NodeDatabase_Legacy_msg) // both NodeDatabase descriptors contain std::vector members
memset(dest_struct, 0, objSize);
if (!pb_decode(&stream, fields, dest_struct)) {
LOG_ERROR("Error: can't decode protobuf %s", PB_GET_ERROR(&stream));
@@ -1599,7 +1599,7 @@ void NodeDB::loadFromDisk()
nodeDatabase.nodes.reserve(maxToMigrate);
size_t posCount = 0, telCount = 0;
{
concurrency::LockGuard satelliteGuard(&satelliteMutex);
concurrency::LockGuard guard(&satelliteMutex);
for (size_t i = 0; i < maxToMigrate; ++i) {
const auto &legacy = legacyDb.nodes[i];
meshtastic_NodeInfoLite slim = meshtastic_NodeInfoLite_init_default;
src/modules/KeyVerificationModule.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ void copyNodeLongNameOrUnknown(char *dest, size_t destSize, const meshtastic_Nod
if (!dest || destSize == 0)
return;
const char *name = (node && nodeInfoLiteHasUser(node) && node->long_name[0]) ? node->long_name : "Unknown";
strncpy(dest, name, destSize);
strncpy(dest, name, destSize - 1);
dest[destSize - 1] = '\0';
}
} // namespace
src/serialization/MeshPacketSerializer.cpp
+4 -2
View File
@@ -322,8 +322,10 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(num);
bool name_known = nodeInfoLiteHasUser(node);
if (name_known) {
memcpy(long_name, node->long_name, sizeof(node->long_name));
long_name[sizeof(node->long_name)] = '\0';
const size_t copy_len =
(sizeof(node->long_name) < sizeof(long_name)) ? sizeof(node->long_name) : sizeof(long_name) - 1;
memcpy(long_name, node->long_name, copy_len);
long_name[copy_len] = '\0';
}
route->push_back(new JSONValue(long_name));
};
src/serialization/MeshPacketSerializer_nRF52.cpp
+4 -2
View File
@@ -294,8 +294,10 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(num);
bool name_known = nodeInfoLiteHasUser(node);
if (name_known) {
memcpy(long_name, node->long_name, sizeof(node->long_name));
long_name[sizeof(node->long_name)] = '\0';
const size_t copy_len =
(sizeof(node->long_name) < sizeof(long_name)) ? sizeof(node->long_name) : sizeof(long_name) - 1;
memcpy(long_name, node->long_name, copy_len);
long_name[copy_len] = '\0';
}
route->add(long_name);
};