Commit90ce6f1

committed

Avoid crashes when .available() is called by detecting that underlying stream has closed.

1 parent02cfb98 commit90ce6f1Copy full SHA for 90ce6f1

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -193,11 +193,15 @@ FirebaseStream::FirebaseStream(const std::string& host, const std::string& auth,`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`boolFirebaseStream::available() {`
`196`		`-return http_->getStreamPtr()->available();`
	`196`	`+auto client = http_->getStreamPtr();`
	`197`	`+return (client ==nullptr) ?false : client->available();`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`FirebaseStream::EventFirebaseStream::read(std::string& event) {`
`200`	`201`	`auto client = http_->getStreamPtr();`
	`202`	`+if (client ==nullptr) {`
	`203`	`+returnEvent();`
	`204`	`+ }`
`201`	`205`	`Event type;`
`202`	`206`	`std::string typeStr = client->readStringUntil('\n').substring(7).c_str();`
`203`	`207`	`if (typeStr =="put") {`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,15 @@ void FirebaseArduino::stream(const String& path) {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`boolFirebaseArduino::available() {`
`134`		`-return http_->getStreamPtr()->available();`
	`134`	`+auto client = http_->getStreamPtr();`
	`135`	`+return (client ==nullptr) ?false : client->available();`
`135`	`136`	`}`
`136`	`137`
`137`	`138`	`FirebaseObjectFirebaseArduino::readEvent() {`
`138`	`139`	`auto client = http_->getStreamPtr();`
	`140`	`+if (client ==nullptr) {`
	`141`	`+returnFirebaseObject("");`
	`142`	`+ }`
`139`	`143`	`String type = client->readStringUntil('\n').substring(7);;`
`140`	`144`	`String event = client->readStringUntil('\n').substring(6);`
`141`	`145`	`client->readStringUntil('\n');// consume separator`

Comments

(0)