jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #739 from FreeBear-nc/bugfixes

Browse Source 
Using size_t limits max number to 2^32.
This commit is contained in:
fvanroie 2024-05-22 16:54:21 +02:00 committed by GitHub
commit 07ecdcf1f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/hasp/hasp_parser.cpp
View File

@ -197,24 +197,22 @@ bool Parser::is_only_digits(const char* s)
return strlen(s) == digits; 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 *= 100; // Warning - If filesize up in the Ei range (2^60), we will overflow.
filesize = filesize * 100; 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);
filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 100 for 2 decimal place const char* suffix[] = {D_FILE_SIZE_KILOBYTES, D_FILE_SIZE_MEGABYTES, D_FILE_SIZE_GIGABYTES, "oops"};
if(filesize < D_FILE_SIZE_DIVIDER * 100) #define UNKNOWN_SUFFIX 2
return snprintf_P(buf, len, PSTR("%d" D_DECIMAL_POINT "%02d " D_FILE_SIZE_KILOBYTES), filesize / 100, int n = -1;
filesize % 100); while (filesize > D_FILE_SIZE_DIVIDER * 100 && n < UNKNOWN_SUFFIX) {
n += 1;
filesize /= D_FILE_SIZE_DIVIDER;
}
filesize = filesize / D_FILE_SIZE_DIVIDER; // multiply by 100 for 2 decimal place tmp = (uint32_t) filesize;
if(filesize < D_FILE_SIZE_DIVIDER * 100) return snprintf_P(buf, len, PSTR("%u" D_DECIMAL_POINT "%02u %s"), tmp / 100, tmp % 100, suffix[n]);
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);
} }
uint8_t Parser::get_action_id(const char* action) uint8_t Parser::get_action_id(const char* action)

2
src/hasp/hasp_parser.h
View File

@ -19,7 +19,7 @@ class Parser {
static bool is_true(const char* s); static bool is_true(const char* s);
static bool is_true(JsonVariant json); static bool is_true(JsonVariant json);
static bool is_only_digits(const char* s); 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 #ifndef ARDUINO