Merge pull request #331 from FrankBoesing/stream-find-fix

Stream find Bugfix

teensy3/Stream.cpp

@@ -89,6 +89,8 @@ bool Stream::find(const char *target, size_t length)
 // as find but search ends if the terminator string is found
 bool  Stream::findUntil(const char *target, const char *terminator)
 {
+  if(target == NULL) return true;
+  if(terminator == NULL) return true;	
   return findUntil(target, strlen(target), terminator, strlen(terminator));
 }
 
@@ -100,9 +102,10 @@ bool Stream::findUntil(const char *target, size_t targetLen, const char *termina
   size_t index = 0;  // maximum target string length is 64k bytes!
   size_t termIndex = 0;
   int c;
+  if( target == NULL) return true;
+  if( *target == 0) return true;   // return true if target is a null string
+  if(terminator == NULL) return true;
 
-  if( *target == 0)
-     return true;   // return true if target is a null string
   while( (c = timedRead()) > 0){
     if( c == target[index]){
     //////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);

teensy4/Stream.cpp

@@ -75,7 +75,7 @@ void Stream::setTimeout(unsigned long timeout)  // sets the maximum number of mi
 
  // find returns true if the target string is found
 bool  Stream::find(const char *target)
-{
+{  
   return findUntil(target, NULL);
 }
 
@@ -89,6 +89,8 @@ bool Stream::find(const char *target, size_t length)
 // as find but search ends if the terminator string is found
 bool  Stream::findUntil(const char *target, const char *terminator)
 {
+  if(target == NULL) return true;
+  if(terminator == NULL) return true;	
   return findUntil(target, strlen(target), terminator, strlen(terminator));
 }
 
@@ -101,8 +103,10 @@ bool Stream::findUntil(const char *target, size_t targetLen, const char *termina
   size_t termIndex = 0;
   int c;
 
-  if( *target == 0)
-     return true;   // return true if target is a null string
+  if( target == NULL) return true;
+  if( *target == 0) return true;   // return true if target is a null string
+  if(terminator == NULL) return true;
+	
   while( (c = timedRead()) > 0){
     if( c == target[index]){
     //////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);