eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge branch 'main' into use-different-rot-rate-for-detumble
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details

Browse Source
This commit is contained in:
Marius Eggert 2024-06-24 11:23:56 +02:00
commit 6727950eac
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -25,6 +25,11 @@ will consitute of a breaking change warranting a new major release:
- Solution from `QUEST` will be set to invalid if sun vector and magnetic field vector are too close - Solution from `QUEST` will be set to invalid if sun vector and magnetic field vector are too close
to each other. to each other.
## Fixed
- Added null termination for PLOC MPSoC image taking command which could possibly lead to
default target filenames.
# [v8.1.1] 2024-06-05 # [v8.1.1] 2024-06-05
## Added ## Added

3
linux/payload/plocMpsocHelpers.h
View File

@ -920,13 +920,14 @@ class TcCamTakePic : public TcBase {
} }
size_t deserLen = commandDataLen; size_t deserLen = commandDataLen;
size_t serLen = 0; size_t serLen = 0;
fileName = reinterpret_cast<const char*>(commandData); fileName = std::string(reinterpret_cast<const char*>(commandData));
if (fileName.size() > MAX_FILENAME_SIZE) { if (fileName.size() > MAX_FILENAME_SIZE) {
return FILENAME_TOO_LONG; return FILENAME_TOO_LONG;
} }
deserLen -= fileName.length() + 1; deserLen -= fileName.length() + 1;
*dataPtr += fileName.length() + 1; *dataPtr += fileName.length() + 1;
uint8_t** payloadPtr = &payloadStart; uint8_t** payloadPtr = &payloadStart;
memset(payloadStart, 0, FILENAME_FIELD_SIZE);
memcpy(payloadStart, fileName.data(), fileName.size()); memcpy(payloadStart, fileName.data(), fileName.size());
*payloadPtr += FILENAME_FIELD_SIZE; *payloadPtr += FILENAME_FIELD_SIZE;
serLen += FILENAME_FIELD_SIZE; serLen += FILENAME_FIELD_SIZE;