Преглед изворни кода

Merge pull request #206 from FrankBoesing/patch-1

fix limit checks readString/readStringUntil
teensy4-core
Paul Stoffregen пре 8 година
родитељ
комит
4bcebfd636
1 измењених фајлова са 4 додато и 28 уклоњено
  1. +4
    -28
      teensy3/Stream.cpp

+ 4
- 28
teensy3/Stream.cpp Прегледај датотеку

String Stream::readString(size_t max) String Stream::readString(size_t max)
{ {
String str; String str;
size_t length = str.length();
size_t length = 0;
while (length < max) { while (length < max) {
int c = timedRead(); int c = timedRead();
if (c < 0) { if (c < 0) {
} }
if (c == 0) break; if (c == 0) break;
str += (char)c; str += (char)c;
length++;
} }
return str; return str;
} }
String Stream::readStringUntil(char terminator, size_t max) String Stream::readStringUntil(char terminator, size_t max)
{ {
String str; String str;
size_t length = str.length();
size_t length = 0;
while (length < max) { while (length < max) {
int c = timedRead(); int c = timedRead();
if (c < 0) { if (c < 0) {
} }
if (c == 0 || c == terminator) break; if (c == 0 || c == terminator) break;
str += (char)c; str += (char)c;
length++;
} }
return str; return str;
} }



























Loading…
Откажи
Сачувај