util: UTHmemsearch to use memmem if defined

pull/4550/head
Philippe Antoine 6 years ago committed by Victor Julien
parent ce55d06569
commit f5190da67e

@ -238,6 +238,9 @@
#include <sys/random.h>
])
AC_CHECK_FUNC([memmem],
AC_DEFINE([HAVE_MEMMEM], [1], [Use memmem]), [])
AC_CHECK_FUNCS([utime])
OCFLAGS=$CFLAGS

@ -3,7 +3,7 @@ identifier i;
position p1;
@@
\(strtok@i\|sprintf@i\|strcat@i\|strcpy@i\|strncpy@i\|strncat@i\|strchrnul@i\|rand@i\|rand_r@i\|memmem@i\|index@i\|rindex@i\|bzero@i\)(...)@p1
\(strtok@i\|sprintf@i\|strcat@i\|strcpy@i\|strncpy@i\|strncat@i\|strchrnul@i\|rand@i\|rand_r@i\|index@i\|rindex@i\|bzero@i\)(...)@p1
@script:python@
p1 << banned.p1;

@ -995,6 +995,18 @@ static int CheckUTHTestPacket(Packet *p, uint8_t ipproto)
return 1;
}
#ifdef HAVE_MEMMEM
#include <string.h>
void * UTHmemsearch(const void *big, size_t big_len, const void *little, size_t little_len) {
return memmem(big, big_len, little, little_len);
}
#else
#include "util-spm-bs.h"
void * UTHmemsearch(const void *big, size_t big_len, const void *little, size_t little_len) {
return BasicSearch(big, big_len, little, little_len);
}
#endif //HAVE_MEMMEM
/**
* \brief UTHBuildPacketRealTest01 wrapper to check packets for unittests
*/

@ -61,6 +61,7 @@ uint32_t UTHBuildPacketOfFlows(uint32_t, uint32_t, uint8_t);
Packet *UTHBuildPacketIPV6Real(uint8_t *, uint16_t , uint8_t ipproto, const char *, const char *,
uint16_t , uint16_t );
void * UTHmemsearch(const void *big, size_t big_len, const void *little, size_t little_len);
int UTHParseSignature(const char *str, bool expect);
#endif

Loading…
Cancel
Save