Allow memstr() to be called with NULL arguments

This commit is contained in:
Tobias Brunner
2013-06-11 11:03:12 +02:00
parent 438a6693ca
commit 7b91011d6e
+6 -1
View File
@@ -102,7 +102,12 @@ void memwipe_noinline(void *ptr, size_t n)
void *memstr(const void *haystack, const char *needle, size_t n)
{
unsigned const char *pos = haystack;
size_t l = strlen(needle);
size_t l;
if (!haystack || !needle || (l = strlen(needle)) == 0)
{
return NULL;
}
for (; n >= l; ++pos, --n)
{
if (memeq(pos, needle, l))