EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

bugfix: when passing negative start index to find(), don't start earlier than index 0

Browse Source
This commit is contained in:
zimoch
2020-03-02 09:11:50 +01:00
parent 967539c4e1
commit 4d3672994d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/StreamBuffer.h
View File

@ -199,11 +199,10 @@ public:
// find: get index of data in buffer or -1 // find: get index of data in buffer or -1
ssize_t find(char c, ssize_t start=0) const ssize_t find(char c, ssize_t start=0) const
{char* p; {if (start < 0 && (start -= len) < 0) start = 0;
char* p;
return (p = static_cast<char*>( return (p = static_cast<char*>(
memchr(buffer+offs+(start<0?start+len:start), memchr(buffer+offs+start, c, len-start)))? p-(buffer+offs) : -1;}
c, start<0?-start:len-start)))?
p-(buffer+offs) : -1;}
ssize_t find(const void* s, size_t size, ssize_t start=0) const; ssize_t find(const void* s, size_t size, ssize_t start=0) const;