Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-09-20 01:27:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fixes sml parser to process extended length lists with a number of items that is dividable by 16 (#6148)

Browse source
This commit is contained in:
irgendwienet 2024-07-22 01:42:09 +02:00 committed by Jesse Hills
parent 5bec0a6534
commit 4690e227b8
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
esphome/components/sml/sml_parser.cpp
View file

@ -27,7 +27,7 @@ bool SmlFile::setup_node(SmlNode *node) {
uint8_t parse_length = length; uint8_t parse_length = length;
if (has_extended_length) { if (has_extended_length) {
length = (length << 4) + (this->buffer_[this->pos_ + 1] & 0x0f); length = (length << 4) + (this->buffer_[this->pos_ + 1] & 0x0f);
parse_length = length - 1; parse_length = length;
this->pos_ += 1; this->pos_ += 1;
} }
@ -37,7 +37,9 @@ bool SmlFile::setup_node(SmlNode *node) {
node->type = type & 0x07; node->type = type & 0x07;
node->nodes.clear(); node->nodes.clear();
node->value_bytes.clear(); node->value_bytes.clear();
if (this->buffer_[this->pos_] == 0x00) { // end of message
// if the list is a has_extended_length list with e.g. 16 elements this is a 0x00 byte but not the end of message
if (!has_extended_length && this->buffer_[this->pos_] == 0x00) { // end of message
this->pos_ += 1; this->pos_ += 1;
} else if (is_list) { // list } else if (is_list) { // list
this->pos_ += 1; this->pos_ += 1;