Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-19 05:23:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68 from dariomanesku/master

Browse Source 
Fixing stristr(). It now uses strnlen() instead of strlen() in its impl.
This commit is contained in:
Branimir Karadžić
2015-08-22 09:53:48 -07:00
parent da9495892f b616515ba0
commit 684256f30d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/bx/string.h
View File

@@ -113,24 +113,24 @@ namespace bx
return NULL;
}
/// Find substring in string. Case insensitive. Limit search to _size.
/// Find substring in string. Case insensitive. Limit search to _max.
inline const char* stristr(const char* _str, const char* _find, size_t _max)
{
const char* ptr = _str;
const size_t total = strlen(_str);
size_t len = _max < total ? _max : total;
size_t stringLen = strnlen(_str, _max);
const size_t findLen = strlen(_find);
for (const size_t searchLen = strlen(_find); len >= searchLen; ++ptr, --len)
for (; stringLen >= findLen; ++ptr, --stringLen)
{
// Find start of the string.
while (tolower(*ptr) != tolower(*_find) )
{
++ptr;
--len;
--stringLen;
// Search pattern lenght can't be longer than the string.
if (searchLen > len)
if (findLen > stringLen)
{
return NULL;
}