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

Fix PSram memory leak for CC push images

Browse Source
This commit is contained in:
fvanroie 2022-02-02 00:56:39 +01:00
parent 6c37025714
commit 522938417c
2 changed files with 75 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/hasp/hasp_attribute.cpp
View File

@ -1110,9 +1110,9 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
HTTPClient http; HTTPClient http;
http.begin(payload); http.begin(payload);
const char* hdrs[] = {"Content-Type"}; // const char* hdrs[] = {"Content-Type"};
size_t numhdrs = sizeof(hdrs) / sizeof(char*); // size_t numhdrs = sizeof(hdrs) / sizeof(char*);
http.collectHeaders(hdrs, numhdrs); // http.collectHeaders(hdrs, numhdrs);
int httpCode = http.GET(); int httpCode = http.GET();
if(httpCode == HTTP_CODE_OK) { if(httpCode == HTTP_CODE_OK) {
@ -1121,7 +1121,7 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
int buf_len = total; int buf_len = total;
int dsc_len = sizeof(lv_img_dsc_t) + url_len; int dsc_len = sizeof(lv_img_dsc_t) + url_len;
if(buf_len <= 0) { // header could not fit if(buf_len <= 8) { // header could not fit
LOG_ERROR(TAG_ATTR, "img data size is too small %d", buf_len); LOG_ERROR(TAG_ATTR, "img data size is too small %d", buf_len);
return HASP_ATTR_TYPE_STR; return HASP_ATTR_TYPE_STR;
} }
@ -1160,42 +1160,82 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
// LOG_WARNING(TAG_ATTR, "%s %d %x == %x", __FILE__, __LINE__, img_dsc->data, img_buf); // LOG_WARNING(TAG_ATTR, "%s %d %x == %x", __FILE__, __LINE__, img_dsc->data, img_buf);
int read = 0; int read = 0;
while(http.connected() && (buf_len > 0)) { while(http.connected() && (stream->available() < 8) && read < 250) {
delay(1); // wait for header
read++; // time-out check
}
// Read image header
read = 0;
const uint8_t png_magic[] = {0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a};
if(stream->available() >= 8) {
int c = stream->readBytes(img_buf_pos, 8); // don't read too far
if(!memcmp(png_magic, img_buf_pos, sizeof(png_magic))) {
// PNG image, keep all data and advance buffer
LOG_VERBOSE(TAG_ATTR, D_BULLET "PNG HEADER: %d bytes read=%d buf_len=%d", c, read, buf_len);
img_buf_pos += c;
buf_len -= c;
read += c;
} else {
// BIN format, copy the header
lv_img_header_t* header = (lv_img_header_t*)img_buf_pos;
img_dsc->header.always_zero = 0;
img_dsc->header.w = header->w;
img_dsc->header.h = header->h;
img_dsc->header.cf = header->cf;
LOG_VERBOSE(TAG_ATTR, D_BULLET "BIN image: w=%d h=%d cf=%d len=%d", img_dsc->header.w,
img_dsc->header.h, img_dsc->header.cf, img_dsc->data_size);
img_buf_pos += sizeof(lv_img_header_t);
// shift remainder of 8 data-bytes to the start of the buffer
memcpy(img_buf_start, img_buf_pos, 8U - sizeof(lv_img_header_t));
buf_len -= c;
read += c;
}
} else {
// disconnected
hasp_free(img_buf_start);
lv_mem_free(img_dsc); // destroy header too
LOG_ERROR(TAG_ATTR, "img header read failed %d", buf_len);
return HASP_ATTR_TYPE_STR;
}
// Read image data
while(http.connected() && (buf_len > 0)) {
if(size_t size = stream->available()) { if(size_t size = stream->available()) {
int c = stream->readBytes(img_buf_pos, size > buf_len ? buf_len : size); // don't read too far int c = stream->readBytes(img_buf_pos, size > buf_len ? buf_len : size); // don't read too far
// LOG_WARNING(TAG_ATTR, "%s %d %x -> %x", __FILE__, __LINE__, img_dsc->data, img_buf); // LOG_WARNING(TAG_ATTR, "%s %d %x -> %x", __FILE__, __LINE__, img_dsc->data, img_buf);
img_buf_pos += c; img_buf_pos += c;
buf_len -= c; buf_len -= c;
LOG_VERBOSE(TAG_ATTR, D_BULLET "IMG DATA: %d bytes read=%d buf_len=%d", c, read, buf_len); // LOG_VERBOSE(TAG_ATTR, D_BULLET "IMG DATA: %d bytes read=%d buf_len=%d", c, read, buf_len);
read += c; read += c;
} else { } else {
delay(1); // wait for data // delay(1); // wait for data
} }
} }
// disconnected
if(buf_len > 0) {
hasp_free(img_buf_start);
lv_mem_free(img_dsc); // destroy header too
LOG_ERROR(TAG_ATTR, "img data read failed %d", buf_len);
return HASP_ATTR_TYPE_STR;
}
LOG_VERBOSE(TAG_ATTR, D_BULLET "HTTP TOTAL READ: %d bytes, %d buffered", read, LOG_VERBOSE(TAG_ATTR, D_BULLET "HTTP TOTAL READ: %d bytes, %d buffered", read,
img_buf_pos - img_buf_start); img_buf_pos - img_buf_start);
const uint8_t png_magic[] = {0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a}; if(total > 24 && !memcmp(png_magic, img_dsc->data, sizeof(png_magic))) {
if(total > 16 && !memcmp(png_magic, img_dsc->data, sizeof(png_magic))) {
// PNG format, get image size from header // PNG format, get image size from header
img_dsc->header.always_zero = 0; img_dsc->header.always_zero = 0;
img_dsc->header.w = img_buf_start[19] + (img_buf_start[18] << 8); img_dsc->header.w = img_buf_start[19] + (img_buf_start[18] << 8);
img_dsc->header.h = img_buf_start[23] + (img_buf_start[22] << 8); img_dsc->header.h = img_buf_start[23] + (img_buf_start[22] << 8);
img_dsc->data_size = img_buf_pos - img_buf_start; // end of buffer - start of buffer img_dsc->data_size = img_buf_pos - img_buf_start; // end of buffer - start of buffer
img_dsc->header.cf = LV_IMG_CF_RAW_ALPHA; img_dsc->header.cf = LV_IMG_CF_RAW_ALPHA;
// img_dsc->data = img_dsc->data; // already set
LOG_VERBOSE(TAG_ATTR, D_BULLET "PNG image: w=%d h=%d cf=%d len=%d", img_dsc->header.w, LOG_VERBOSE(TAG_ATTR, D_BULLET "PNG image: w=%d h=%d cf=%d len=%d", img_dsc->header.w,
img_dsc->header.h, img_dsc->header.cf, img_dsc->data_size); img_dsc->header.h, img_dsc->header.cf, img_dsc->data_size);
} else { } else {
// BIN format, includes a header
lv_img_header_t* header = (lv_img_header_t*)img_buf_start;
img_dsc->header.always_zero = 0;
img_dsc->header.w = header->w;
img_dsc->header.h = header->h;
img_dsc->header.cf = header->cf;
img_dsc->data = img_buf_start + sizeof(lv_img_header_t); // start of buf + skip header
img_dsc->data_size = img_buf_pos - img_buf_start - sizeof(lv_img_header_t); // end buf - start buf img_dsc->data_size = img_buf_pos - img_buf_start - sizeof(lv_img_header_t); // end buf - start buf
LOG_VERBOSE(TAG_ATTR, D_BULLET "BIN image: w=%d h=%d cf=%d len=%d", img_dsc->header.w, LOG_VERBOSE(TAG_ATTR, D_BULLET "BIN image: w=%d h=%d cf=%d len=%d", img_dsc->header.w,
img_dsc->header.h, img_dsc->header.cf, img_dsc->data_size); img_dsc->header.h, img_dsc->header.cf, img_dsc->data_size);
@ -1379,15 +1419,17 @@ static hasp_attribute_type_t attribute_common_json(lv_obj_t* obj, uint16_t attr_
bool update) bool update)
{ {
switch(attr_hash) { switch(attr_hash) {
case ATTR_JSONL: case ATTR_JSONL: {
DeserializationError jsonError;
if(update) { if(update) {
size_t maxsize = (512u + JSON_OBJECT_SIZE(25)); size_t maxsize = (512u + JSON_OBJECT_SIZE(25));
DynamicJsonDocument json(maxsize); DynamicJsonDocument json(maxsize);
// Note: Deserialization can to be (char *) so the objects WILL NOT be copied // Note: Deserialization can to be (char *) so the objects WILL NOT be copied
// this uses less memory since the data is already copied from the mqtt receive buffer and cannot get // this uses less memory since the data is already copied from the mqtt receive buffer and cannot
// overwritten by the send buffer !! // get overwritten by the send buffer !!
DeserializationError jsonError = deserializeJson(json, (char*)payload); DeserializationError jsonError = deserializeJson(json, (char*)payload);
json.shrinkToFit(); json.shrinkToFit();
@ -1398,17 +1440,18 @@ static hasp_attribute_type_t attribute_common_json(lv_obj_t* obj, uint16_t attr_
} else { } else {
jsonError = DeserializationError::InvalidInput; jsonError = DeserializationError::InvalidInput;
} }
} else {
jsonError = DeserializationError::IncompleteInput;
} }
if(jsonError) { // Couldn't parse incoming JSON object
dispatch_json_error(TAG_ATTR, jsonError);
return HASP_ATTR_TYPE_METHOD_OK;
}
} else {
return HASP_ATTR_TYPE_NOT_FOUND;
} }
if(jsonError) { // Couldn't parse incoming JSON object
dispatch_json_error(TAG_ATTR, jsonError);
return HASP_ATTR_TYPE_JSON_INVALID;
}
break; // attribute_found break; // attribute_found
}
default: default:
return HASP_ATTR_TYPE_NOT_FOUND; return HASP_ATTR_TYPE_NOT_FOUND;

5
src/hasp/hasp_attribute.h
View File

@ -39,8 +39,9 @@ typedef enum {
HASP_ATTR_TYPE_LONG_MODE_INVALID = -10, HASP_ATTR_TYPE_LONG_MODE_INVALID = -10,
HASP_ATTR_TYPE_RANGE_ERROR = -9, HASP_ATTR_TYPE_RANGE_ERROR = -9,
HASP_ATTR_TYPE_METHOD_INVALID_FOR_PAGE = -8, HASP_ATTR_TYPE_METHOD_INVALID_FOR_PAGE = -8,
HASP_ATTR_TYPE_ALIGN_INVALID = -6, HASP_ATTR_TYPE_ALIGN_INVALID = -7,
HASP_ATTR_TYPE_COLOR_INVALID = -5, HASP_ATTR_TYPE_COLOR_INVALID = -6,
HASP_ATTR_TYPE_JSON_INVALID = -5,
HASP_ATTR_TYPE_JSON_READONLY = -4, HASP_ATTR_TYPE_JSON_READONLY = -4,
HASP_ATTR_TYPE_STR_READONLY = -3, HASP_ATTR_TYPE_STR_READONLY = -3,
HASP_ATTR_TYPE_BOOL_READONLY = -2, HASP_ATTR_TYPE_BOOL_READONLY = -2,