avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bug #54159, Buffer overflow in usbtiny.c

This commit is contained in:
Marius Greuel 2018-04-14 15:05:26 +02:00
parent 5e98e96112
commit ad00133ca3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usbtiny.c
View File

@ -641,6 +641,8 @@ static int usbtiny_paged_load (PROGRAMMER * pgm, AVRPART * p, AVRMEM* m,
for (; addr < maxaddr; addr += chunk) { for (; addr < maxaddr; addr += chunk) {
chunk = PDATA(pgm)->chunk_size; // start with the maximum chunk size possible chunk = PDATA(pgm)->chunk_size; // start with the maximum chunk size possible
if (chunk > maxaddr - addr)
chunk = maxaddr - addr;
// Send the chunk of data to the USBtiny with the function we want // Send the chunk of data to the USBtiny with the function we want
// to perform // to perform
@ -696,6 +698,8 @@ static int usbtiny_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
for (; addr < maxaddr; addr += chunk) { for (; addr < maxaddr; addr += chunk) {
// start with the max chunk size // start with the max chunk size
chunk = PDATA(pgm)->chunk_size; chunk = PDATA(pgm)->chunk_size;
if (chunk > maxaddr - addr)
chunk = maxaddr - addr;
// we can only write a page at a time anyways // we can only write a page at a time anyways
if (m->paged && chunk > page_size) if (m->paged && chunk > page_size)