piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Correct errors in labels.yml if modelname is full length (#2448)

Browse Source
This commit is contained in:
Cliff
2022-10-03 13:04:47 +10:00
committed by GitHub
parent c0e28d17ef
commit 8c2b3c0bff
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/modelslist.cpp
+6 -3
View File
@@ -941,8 +941,10 @@ void ModelMap::updateModelCell(ModelCell *cell)
TRACE("Labels: Updating model %s", cell->modelFilename);
readModelYaml(cell->modelFilename, (uint8_t *)model, sizeof(ModelData));
strcpy(cell->modelName, model->header.name);
strcpy(cell->modelBitmap, model->header.bitmap);
strncpy(cell->modelName, model->header.name, LEN_MODEL_NAME);
cell->modelName[LEN_MODEL_NAME] = '\0';
strncpy(cell->modelBitmap, model->header.bitmap, LEN_BITMAP_NAME);
cell->modelBitmap[LEN_BITMAP_NAME] = '\0';
LabelsVector labels = ModelMap::fromCSV(model->header.labels);
for(const auto &lbl : labels ) {
modelslabels.addLabelToModel(lbl,cell);
@@ -1137,7 +1139,8 @@ bool ModelsList::loadYaml()
TRACE_LABELS(" Created a modelcell for %s, not in labels.yml",
filehash.name.c_str());
model = new ModelCell(filehash.name.c_str());
strcpy(model->modelFinfoHash, filehash.hash);
strncpy(model->modelFinfoHash, filehash.hash, FILE_HASH_LENGTH);
model->modelFinfoHash[FILE_HASH_LENGTH] = '\0';
modelslist.push_back(model);
filehash.celladded = true;
model->_isDirty = true;