gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-13 02:07:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix ATMEGA BASH_SERIAL buffer overrun

Browse Source 
Changed the compare to TXBUFFER_SIZE to >=
If next wasn't set to zero until > TXBUFFER_SIZE then the next time the
routines get called the the array index references outside the buffer
(e.g tail+1)
This commit is contained in:
Dennis 2017-11-25 19:53:15 -05:00
parent 4b7e4d6bad
commit ba4526ee89
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Multiprotocol/Telemetry.ino
View File

@ -975,7 +975,7 @@ void Serial_write( uint8_t byte )
byte |= 1 ; // Start bit
#endif
uint8_t next = SerialControl.head + 2;
if(next>TXBUFFER_SIZE)
if(next>=TXBUFFER_SIZE)
next=0;
if ( next != SerialControl.tail )
{
@ -1069,7 +1069,7 @@ ISR(TIMER0_COMPB_vect)
GPIOR0 = ptr->data[ptr->tail] ;
GPIOR2 = ptr->data[ptr->tail+1] ;
uint8_t nextTail = ptr->tail + 2 ;
if ( nextTail > TXBUFFER_SIZE )
if ( nextTail >= TXBUFFER_SIZE )
nextTail = 0 ;
ptr->tail = nextTail ;
GPIOR1 = 8 ;
@ -1112,7 +1112,7 @@ ISR(TIMER0_OVF_vect)
GPIOR0 = ptr->data[ptr->tail] ;
GPIOR2 = ptr->data[ptr->tail+1] ;
uint8_t nextTail = ptr->tail + 2 ;
if ( nextTail > TXBUFFER_SIZE )
if ( nextTail >= TXBUFFER_SIZE )
nextTail = 0 ;
ptr->tail = nextTail ;
GPIOR1 = 10 ;