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

kotl · kotl · commit 90ce6f1e0377 · 2017-11-12T22:16:53.000-05:00
diff --git a/src/Firebase.cpp b/src/Firebase.cpp
@@ -193,11 +193,15 @@ FirebaseStream::FirebaseStream(const std::string& host, const std::string& auth,
 }
 
 bool FirebaseStream::available() {
-  return http_->getStreamPtr()->available();
+  auto client = http_->getStreamPtr();
+  return (client == nullptr) ? false : client->available();
 }
 
 FirebaseStream::Event FirebaseStream::read(std::string& event) {
   auto client = http_->getStreamPtr();
+  if (client == nullptr) { 
+      return Event();
+  } 
   Event type;
   std::string typeStr = client->readStringUntil('\n').substring(7).c_str();
   if (typeStr == "put") {
diff --git a/src/FirebaseArduino.cpp b/src/FirebaseArduino.cpp
@@ -131,11 +131,15 @@ void FirebaseArduino::stream(const String& path) {
 }
 
 bool FirebaseArduino::available() {
-  return http_->getStreamPtr()->available();
+  auto client = http_->getStreamPtr();
+  return (client == nullptr) ? false : client->available();
 }
 
 FirebaseObject FirebaseArduino::readEvent() {
   auto client = http_->getStreamPtr();
+  if (client == nullptr) { 
+      return FirebaseObject("");
+  } 
   String type = client->readStringUntil('\n').substring(7);;
   String event = client->readStringUntil('\n').substring(6);
   client->readStringUntil('\n'); // consume separator
