feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Fixed deserializer that stopped reading at the first 0xFF (closes #1118)

Browse Source
This commit is contained in:
Benoit Blanchon
2019-10-29 14:17:11 +01:00
parent 3a169df0a5
commit ef63757b1a
4 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
View File

@ -11,20 +11,21 @@ namespace ARDUINOJSON_NAMESPACE {
template <typename TSource>
struct Reader<TSource,
typename enable_if<is_base_of<Stream, TSource>::value>::type> {
Stream& _stream;
public:
explicit Reader(Stream& stream) : _stream(stream) {}
explicit Reader(Stream& stream) : _stream(&stream) {}
int read() {
// don't use _stream.read() as it ignores the timeout
char c;
return _stream.readBytes(&c, 1) ? c : -1;
return _stream->readBytes(&c, 1) ? static_cast<unsigned char>(c) : -1;
}
size_t readBytes(char* buffer, size_t length) {
return _stream.readBytes(buffer, length);
return _stream->readBytes(buffer, length);
}
private:
Stream* _stream;
};
} // namespace ARDUINOJSON_NAMESPACE