Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 02:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

HAL_VRBrain: prevent read past end of buffer

Browse Source
This commit is contained in:
Andrew Tridgell 2014-08-19 09:30:19 +10:00
parent 0a20d0db60
commit 21ff578cb0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL_VRBRAIN/UARTDriver.cpp
View File

@ -503,7 +503,7 @@ void VRBRAINUARTDriver::_timer_tick(void)
// split into two writes // split into two writes
uint16_t n1 = _writebuf_size - _writebuf_head; uint16_t n1 = _writebuf_size - _writebuf_head;
int ret = _write_fd(&_writebuf[_writebuf_head], n1); int ret = _write_fd(&_writebuf[_writebuf_head], n1);
if (ret == n1 && n != n1) { if (ret == n1 && n > n1) {
_write_fd(&_writebuf[_writebuf_head], n - n1); _write_fd(&_writebuf[_writebuf_head], n - n1);
} }
} }
@ -523,7 +523,7 @@ void VRBRAINUARTDriver::_timer_tick(void)
uint16_t n1 = _readbuf_size - _readbuf_tail; uint16_t n1 = _readbuf_size - _readbuf_tail;
assert(_readbuf_tail+n1 <= _readbuf_size); assert(_readbuf_tail+n1 <= _readbuf_size);
int ret = _read_fd(&_readbuf[_readbuf_tail], n1); int ret = _read_fd(&_readbuf[_readbuf_tail], n1);
if (ret == n1 && n != n1) { if (ret == n1 && n > n1) {
assert(_readbuf_tail+(n-n1) <= _readbuf_size); assert(_readbuf_tail+(n-n1) <= _readbuf_size);
_read_fd(&_readbuf[_readbuf_tail], n - n1); _read_fd(&_readbuf[_readbuf_tail], n - n1);
} }