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

Author: Federico Fissore

build/shared/revisions.txt

@@ -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]

libraries/Bridge/src/FileIO.cpp

@@ -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