noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x

This commit is contained in:
Federico Fissore 2013-09-20 10:40:09 +02:00
parent 553ef6ee70 be936dd590
commit 651f85b021
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/shared/revisions.txt
View File

@ -1,4 +1,9 @@
ARDUINO 1.5.5 BETA
[libraries]
* avr: Fixed buffer overflow in File::doBuffer() (dreggy)
ARDUINO 1.5.4 BETA 2013.09.10
[ide]

6
libraries/Bridge/src/FileIO.cpp
View File

@ -116,10 +116,10 @@ void File::doBuffer() {
if (buffered > 0)
return;
// Try to buffer up to 32 characters
// Try to buffer up to BUFFER_SIZE characters
readPos = 0;
uint8_t cmd[] = {'G', handle, sizeof(buffer)};
buffered = bridge.transfer(cmd, 3, buffer, sizeof(buffer)) - 1;
uint8_t cmd[] = {'G', handle, BUFFER_SIZE - 1};
buffered = bridge.transfer(cmd, 3, buffer, BUFFER_SIZE) - 1;
//err = buff[0]; // First byte is error code
if (buffered>0) {
// Shift the reminder of buffer