Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-01 01:19:45 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[api] Fix undefined behavior in noise handshake with empty rx buffer (#14722)

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-12 07:16:23 -10:00
committed by GitHub
parent 70d188202a
commit 618312f0ee
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/api_frame_helper_noise.cpp
+7 -4
View File
@@ -258,10 +258,13 @@ APIError APINoiseFrameHelper::state_action_() {
// ignore contents, may be used in future for flags // ignore contents, may be used in future for flags
// Resize for: existing prologue + 2 size bytes + frame data // Resize for: existing prologue + 2 size bytes + frame data
size_t old_size = this->prologue_.size(); size_t old_size = this->prologue_.size();
this->prologue_.resize(old_size + 2 + this->rx_buf_.size()); size_t rx_size = this->rx_buf_.size();
this->prologue_[old_size] = (uint8_t) (this->rx_buf_.size() >> 8); this->prologue_.resize(old_size + 2 + rx_size);
this->prologue_[old_size + 1] = (uint8_t) this->rx_buf_.size(); this->prologue_[old_size] = (uint8_t) (rx_size >> 8);
std::memcpy(this->prologue_.data() + old_size + 2, this->rx_buf_.data(), this->rx_buf_.size()); this->prologue_[old_size + 1] = (uint8_t) rx_size;
if (rx_size > 0) {
std::memcpy(this->prologue_.data() + old_size + 2, this->rx_buf_.data(), rx_size);
}
state_ = State::SERVER_HELLO; state_ = State::SERVER_HELLO;
} }