Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using size_t limits max number to 2^32. #739

Merged
merged 7 commits into from
May 22, 2024
Merged

Using size_t limits max number to 2^32. #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa09f4b
Using size_t limits max number to 2^32. When dealing with SD cards
FreeBear-nc May 21, 2024
33f3c36
Take onboard comment about loss of precision.
FreeBear-nc May 22, 2024
7dc3de3
One too many file system dividers used for megabyte comparison.
FreeBear-nc May 22, 2024
b65bd46
2^60 is Exbi (Ei) not Zebi (Zi)
FreeBear-nc May 22, 2024
452c619
Use a const char* array for format_bytes suffixes at the expense of a…
FreeBear-nc May 22, 2024
e37ca4c
Just in case file size in the TiB range gets passed, make sure we
FreeBear-nc May 22, 2024
fcd9968
Forgot to roll back on a test.
FreeBear-nc May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions src/hasp/hasp_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,24 +197,22 @@ bool Parser::is_only_digits(const char* s)
return strlen(s) == digits;
}

int Parser::format_bytes(size_t filesize, char* buf, size_t len)
int Parser::format_bytes(uint64_t filesize, char* buf, size_t len)
{
if(filesize < D_FILE_SIZE_DIVIDER) return snprintf_P(buf, len, PSTR("%d " D_FILE_SIZE_BYTES), filesize);
filesize = filesize * 100;

filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 100 for 2 decimal place
if(filesize < D_FILE_SIZE_DIVIDER * 100)
return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%02d " D_FILE_SIZE_KILOBYTES), filesize / 100,
filesize % 100);

filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 100 for 2 decimal place
if(filesize < D_FILE_SIZE_DIVIDER * 100)
return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%02d " D_FILE_SIZE_MEGABYTES), filesize / 100,
filesize % 100);

filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 100 for 2 decimal place
return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%02d " D_FILE_SIZE_GIGABYTES), filesize / 100,
filesize % 100);
filesize *= 100; // Warning - If filesize up in the Ei range (2^60), we will overflow.
uint32_t tmp = (uint32_t) filesize; // cast to unsigned int here to saye ugly casts in next line
if(filesize < D_FILE_SIZE_DIVIDER) return snprintf_P(buf, len, PSTR("%u " D_FILE_SIZE_BYTES), tmp);

const char* suffix[] = {D_FILE_SIZE_KILOBYTES, D_FILE_SIZE_MEGABYTES, D_FILE_SIZE_GIGABYTES, "oops"};
#define UNKNOWN_SUFFIX 2
int n = -1;
while (filesize > D_FILE_SIZE_DIVIDER * 100 && n < UNKNOWN_SUFFIX) {
n += 1;
filesize /= D_FILE_SIZE_DIVIDER;
}

tmp = (uint32_t) filesize;
return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u %s"), tmp / 100, tmp % 100, suffix[n]);
}

uint8_t Parser::get_action_id(const char* action)
Expand Down
2 changes: 1 addition & 1 deletion src/hasp/hasp_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Parser {
static bool is_true(const char* s);
static bool is_true(JsonVariant json);
static bool is_only_digits(const char* s);
static int format_bytes(size_t filesize, char* buf, size_t len);
static int format_bytes(uint64_t filesize, char* buf, size_t len);
};

#ifndef ARDUINO
Expand Down