diff options
author | Amulya Kumar Sahoo <amulya349@gmail.com> | 2014-05-30 11:47:08 +0530 |
---|---|---|
committer | Amulya Kumar Sahoo <amulya349@gmail.com> | 2014-05-30 11:47:08 +0530 |
commit | 2f98fe16d79170f6962f681295636a5c4fe010d4 (patch) | |
tree | 220ffae207f2fe6b8542cc98fc3c6cb46add0059 /cores/robot/Stream.cpp | |
parent | 43a8a0f433e3f1971cf1af62b0386fd7c3c786e6 (diff) |
Fix of a bug
Stream::find(char *target) passes NULL as “terminator” to Stream::findUntil(char *target, char *terminator), which immediately dereferences it by passing it on to strlen() :
bool Stream::find(char *target)
{
return findUntil(target, NULL);
}
// as find but search ends if the terminator string is found
bool Stream::findUntil(char *target, char *terminator)
{
return findUntil(target, strlen(target), terminator, strlen(terminator));
}
Diffstat (limited to 'cores/robot/Stream.cpp')
-rw-r--r-- | cores/robot/Stream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/robot/Stream.cpp b/cores/robot/Stream.cpp index aafb7fc..f21a411 100644 --- a/cores/robot/Stream.cpp +++ b/cores/robot/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(char *target) { - return findUntil(target, NULL); + return findUntil(target, ""); } // reads data from the stream until the target string of given length is found |