* stk500v2.c (stk600_xprog_paged_write): Fix a fatal miscalculation
of the number of bytes to be written which caused a malloc chunk corruption. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@778 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
parent
5d0bfcaf4c
commit
7f29eb67ea
|
@ -1,3 +1,9 @@
|
||||||
|
2008-07-29 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
||||||
|
|
||||||
|
* stk500v2.c (stk600_xprog_paged_write): Fix a fatal miscalculation
|
||||||
|
of the number of bytes to be written which caused a malloc chunk
|
||||||
|
corruption.
|
||||||
|
|
||||||
2008-07-27 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
2008-07-27 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
||||||
|
|
||||||
First implementation of ATxmega support. By now, only the
|
First implementation of ATxmega support. By now, only the
|
||||||
|
|
18
stk500v2.c
18
stk500v2.c
|
@ -3187,6 +3187,7 @@ static int stk600_xprog_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
|
||||||
unsigned int offset;
|
unsigned int offset;
|
||||||
unsigned char memtype;
|
unsigned char memtype;
|
||||||
int n_bytes_orig = n_bytes;
|
int n_bytes_orig = n_bytes;
|
||||||
|
size_t writesize;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The XPROG read command supports at most 256 bytes in one
|
* The XPROG read command supports at most 256 bytes in one
|
||||||
|
@ -3249,7 +3250,12 @@ static int stk600_xprog_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
|
||||||
}
|
}
|
||||||
unsigned int chunk;
|
unsigned int chunk;
|
||||||
for (chunk = 0; chunk < page_size; chunk += 256) {
|
for (chunk = 0; chunk < page_size; chunk += 256) {
|
||||||
memset(b + 9, 0xff, 256);
|
if (n_bytes < 256) {
|
||||||
|
memset(b + 9 + n_bytes, 0xff, 256 - n_bytes);
|
||||||
|
writesize = n_bytes;
|
||||||
|
} else {
|
||||||
|
writesize = 256;
|
||||||
|
}
|
||||||
b[0] = XPRG_CMD_WRITE_MEM;
|
b[0] = XPRG_CMD_WRITE_MEM;
|
||||||
b[1] = memtype;
|
b[1] = memtype;
|
||||||
if (chunk + 256 == page_size) {
|
if (chunk + 256 == page_size) {
|
||||||
|
@ -3263,7 +3269,7 @@ static int stk600_xprog_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
|
||||||
b[6] = addr;
|
b[6] = addr;
|
||||||
b[7] = 1;
|
b[7] = 1;
|
||||||
b[8] = 0;
|
b[8] = 0;
|
||||||
memcpy(b + 9, mem->buf + offset, n_bytes);
|
memcpy(b + 9, mem->buf + offset, writesize);
|
||||||
if (stk600_xprog_command(pgm, b, 256 + 9, 2) < 0) {
|
if (stk600_xprog_command(pgm, b, 256 + 9, 2) < 0) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"%s: stk600_xprog_paged_write(): XPRG_CMD_WRITE_MEM failed\n",
|
"%s: stk600_xprog_paged_write(): XPRG_CMD_WRITE_MEM failed\n",
|
||||||
|
@ -3278,12 +3284,16 @@ static int stk600_xprog_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
|
||||||
n_bytes -= 256;
|
n_bytes -= 256;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (n_bytes < page_size)
|
if (n_bytes < page_size) {
|
||||||
/*
|
/*
|
||||||
* This can easily happen if the input file was not a
|
* This can easily happen if the input file was not a
|
||||||
* multiple of the page size.
|
* multiple of the page size.
|
||||||
*/
|
*/
|
||||||
memset(b + 9 + n_bytes, 0xff, page_size - n_bytes);
|
memset(b + 9 + n_bytes, 0xff, page_size - n_bytes);
|
||||||
|
writesize = n_bytes;
|
||||||
|
} else {
|
||||||
|
writesize = page_size;
|
||||||
|
}
|
||||||
b[0] = XPRG_CMD_WRITE_MEM;
|
b[0] = XPRG_CMD_WRITE_MEM;
|
||||||
b[1] = memtype;
|
b[1] = memtype;
|
||||||
b[2] = 3; /* erase page | write page */
|
b[2] = 3; /* erase page | write page */
|
||||||
|
@ -3293,7 +3303,7 @@ static int stk600_xprog_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
|
||||||
b[6] = addr;
|
b[6] = addr;
|
||||||
b[7] = page_size >> 8;
|
b[7] = page_size >> 8;
|
||||||
b[8] = page_size;
|
b[8] = page_size;
|
||||||
memcpy(b + 9, mem->buf + offset, n_bytes);
|
memcpy(b + 9, mem->buf + offset, writesize);
|
||||||
if (stk600_xprog_command(pgm, b, page_size + 9, 2) < 0) {
|
if (stk600_xprog_command(pgm, b, page_size + 9, 2) < 0) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"%s: stk600_xprog_paged_write(): XPRG_CMD_WRITE_MEM failed\n",
|
"%s: stk600_xprog_paged_write(): XPRG_CMD_WRITE_MEM failed\n",
|
||||||
|
|
Loading…
Reference in New Issue