Skip to content

Commit

Permalink
fix limit checks readString/readStringUntil
Browse files Browse the repository at this point in the history
  • Loading branch information
FrankBoesing committed Jan 13, 2017
1 parent 4cf0b4c commit b51a304
Showing 1 changed file with 4 additions and 28 deletions.
32 changes: 4 additions & 28 deletions teensy3/Stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ size_t Stream::readBytesUntil(char terminator, char *buffer, size_t length)
String Stream::readString(size_t max)
{
String str;
size_t length = str.length();
size_t length = 0;
while (length < max) {
int c = timedRead();
if (c < 0) {
Expand All @@ -265,14 +265,15 @@ String Stream::readString(size_t max)
}
if (c == 0) break;
str += (char)c;
length++;
}
return str;
}

String Stream::readStringUntil(char terminator, size_t max)
{
String str;
size_t length = str.length();
size_t length = 0;
while (length < max) {
int c = timedRead();
if (c < 0) {
Expand All @@ -281,32 +282,7 @@ String Stream::readStringUntil(char terminator, size_t max)
}
if (c == 0 || c == terminator) break;
str += (char)c;
length++;
}
return str;
}


























0 comments on commit b51a304

Please sign in to comment.