Skip to content

Commit 8131af9

Browse files
committed
Fixed wrong return value in FileIO::size()
Fixes #2203
1 parent fa72cb7 commit 8131af9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

build/shared/revisions.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
ARDUINO 1.5.8 BETA - not yet release
2+
3+
[libraries]
4+
* FileIO bridge: fixed wrong return value in File::size() for size >32768
5+
16
ARDUINO 1.5.7 BETA - 2014.07.07
27

38
[core]

libraries/Bridge/src/FileIO.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,11 @@ uint32_t File::size() {
163163
uint8_t buff[5];
164164
bridge.transfer(cmd, 2, buff, 5);
165165
//err = res[0]; // First byte is error code
166-
uint32_t res = buff[1] << 24;
167-
res += buff[2] << 16;
168-
res += buff[3] << 8;
169-
res += buff[4];
166+
uint32_t res;
167+
res = ((uint32_t)buff[1]) << 24;
168+
res |= ((uint32_t)buff[2]) << 16;
169+
res |= ((uint32_t)buff[3]) << 8;
170+
res |= ((uint32_t)buff[4]);
170171
return res;
171172
}
172173

0 commit comments

Comments
 (0)