UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/sequence][apps/graph] CRC should be called on sizes multiple of 4

Browse Source 
Change-Id: I4a55c14e1418f730051252cabef324833279747f
This commit is contained in:
Émilie Feral
2017-05-23 18:10:01 +02:00
parent d9f2604926
commit ba7d740a10
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/sequence/sequence.cpp
View File

@@ -83,13 +83,11 @@ Sequence& Sequence::operator=(const Sequence& other) {
}
uint32_t Sequence::checksum() {
size_t dataLengthInBytes = 3*TextField::maxBufferSize()*sizeof(char);
assert((dataLengthInBytes & 0x3) == 0); // Assert that dataLengthInBytes is a multiple of 4
char data[3*TextField::maxBufferSize()] = {};
char data[k_dataLengthInBytes/sizeof(char)] = {};
strlcpy(data, text(), TextField::maxBufferSize());
strlcpy(data+TextField::maxBufferSize(), firstInitialConditionText(), TextField::maxBufferSize());
strlcpy(data+2*TextField::maxBufferSize(), secondInitialConditionText(), TextField::maxBufferSize());
return Ion::crc32((uint32_t *)data, dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)data, k_dataLengthInBytes>>2);
}
const char * Sequence::firstInitialConditionText() {

2
apps/sequence/sequence.h
View File

@@ -43,6 +43,8 @@ public:
private:
constexpr static int k_maxRecurrentRank = 10000;
constexpr static float k_maxNumberOfTermsInSum = 100000.0f;
constexpr static size_t k_dataLengthInBytes = 3*TextField::maxBufferSize()*sizeof(char)+2;
static_assert((k_dataLengthInBytes & 0x3) == 0, "The sequence data size is not a multiple of 4 bytes (cannot compute crc)"); // Assert that dataLengthInBytes is a multiple of 4
char symbol() const override;
Type m_type;
char m_firstInitialConditionText[TextField::maxBufferSize()];

6
apps/shared/function.cpp
View File

@@ -27,11 +27,9 @@ Function& Function::operator=(const Function& other) {
}
uint32_t Function::checksum() {
size_t dataLengthInBytes = TextField::maxBufferSize()*sizeof(char);
assert((dataLengthInBytes & 0x3) == 0); // Assert that dataLengthInBytes is a multiple of 4
char data[TextField::maxBufferSize()] = {};
char data[k_dataLengthInBytes/sizeof(char)] = {};
strlcpy(data, m_text, TextField::maxBufferSize());
return Ion::crc32((uint32_t *)data, dataLengthInBytes>>2);
return Ion::crc32((uint32_t *)data, k_dataLengthInBytes>>2);
}
void Function::setContent(const char * c) {

2
apps/shared/function.h
View File

@@ -32,6 +32,8 @@ public:
protected:
mutable Poincare::Expression * m_expression;
private:
constexpr static size_t k_dataLengthInBytes = TextField::maxBufferSize()*sizeof(char)+2;
static_assert((k_dataLengthInBytes & 0x3) == 0, "The function data size is not a multiple of 4 bytes (cannot compute crc)"); // Assert that dataLengthInBytes is a multiple of 4
virtual char symbol() const = 0;
char m_text[TextField::maxBufferSize()];
const char * m_name;