Added optimized memmem/strlcpy version (#2424)

* credits goes to Vladimir Gavrilov

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni
2024-05-08 11:38:53 +02:00
committed by GitHub
parent 2b4e2f9c9a
commit e9dc035c5c
3 changed files with 62 additions and 48 deletions
+7 -7
View File
@@ -5625,35 +5625,35 @@ void strtonumUnitTest() {
void strlcpyUnitTest() {
// Test empty string
char dst_empty[10] = "";
assert(ndpi_strlcpy(dst_empty, "", sizeof(dst_empty)) == 0);
assert(ndpi_strlcpy(dst_empty, "", sizeof(dst_empty), 0) == 0);
assert(dst_empty[0] == '\0');
// Basic copy test
char dst1[10] = "";
assert(ndpi_strlcpy(dst1, "abc", sizeof(dst1)) == 3);
assert(ndpi_strlcpy(dst1, "abc", sizeof(dst1), 3) == 3);
assert(strcmp(dst1, "abc") == 0);
// Test with dst_len smaller than src_len
char dst2[4] = "";
assert(ndpi_strlcpy(dst2, "abcdef", sizeof(dst2)) == 6);
assert(ndpi_strlcpy(dst2, "abcdef", sizeof(dst2), 6) == 6);
assert(strcmp(dst2, "abc") == 0); // Should truncate "abcdef" to "abc"
// Test with dst_len bigger than src_len
char dst3[10] = "";
assert(ndpi_strlcpy(dst3, "abc", sizeof(dst3)) == 3);
assert(ndpi_strlcpy(dst3, "abc", sizeof(dst3), 3) == 3);
assert(strcmp(dst3, "abc") == 0);
// Test with dst_len equal to 1 (only null terminator should be copied)
char dst4[1];
assert(ndpi_strlcpy(dst4, "abc", sizeof(dst4)) == 3);
assert(ndpi_strlcpy(dst4, "abc", sizeof(dst4), 3) == 3);
assert(dst4[0] == '\0'); // Should only contain the null terminator
// Test with NULL source, expecting return value to be 0
char dst5[10];
assert(ndpi_strlcpy(dst5, NULL, sizeof(dst5)) == 0);
assert(ndpi_strlcpy(dst5, NULL, sizeof(dst5), 0) == 0);
// Test with NULL destination, should also return 0 without crashing
assert(ndpi_strlcpy(NULL, "abc", sizeof(dst5)) == 0);
assert(ndpi_strlcpy(NULL, "abc", sizeof(dst5), 3) == 0);
}
/* *********************************************** */
+28 -17
View File
@@ -2235,30 +2235,41 @@ extern "C" {
const char *ndpi_lru_cache_idx_to_name(lru_cache_type idx);
/**
* Searches for a subsequence ('needle') within a block of memory ('haystack').
* @brief Finds the first occurrence of the sequence `needle` in the array
* `haystack`.
*
* @par haystack = pointer to the block of memory where the search is performed
* @par haystack_len = length of the haystack block of memory
* @par needle = pointer to the memory block representing the needle to search for
* @par needle_len = length of the needle memory block
*
* @return Pointer to the beginning of the needle within the haystack if found;
* otherwise, NULL.
* This function searches for the first occurrence of the sequence `needle` of
* length `needle_len` in the array `haystack` of length `haystack_len`. If
* `haystack` or `needle` is `NULL`, or `haystack_len` is less than
* `needle_len`, or `needle_len` is 0, the function returns `NULL`.
*
* For optimization, if `needle_len` is 1, the `memchr` function is used.
*
* @param haystack Pointer to the array in which the search is performed.
* @param haystack_len Length of the `haystack` array.
* @param needle Pointer to the array to be searched for in `haystack`.
* @param needle_len Length of the `needle` array.
* @return Pointer to the first occurrence of `needle` in `haystack` or `NULL`
* if `needle` is not found.
*/
void* ndpi_memmem(const void* haystack, size_t haystack_len, const void* needle,
size_t needle_len);
/**
* Copies up to -dst_len - 1- characters from -src- to -dst-, ensuring the result is
* null-terminated. Measures -src- length and handles potential null pointers.
*
* @par dst = destination buffer
* @par src = source string
* @par dst_len = size of the destination buffer, includes the null terminator
*
* @return Length of `src`. If greater or equal to -dst_len-, -dst- has been truncated.
* @brief Copies src string to dst buffer with length limit
*
* Copies the string src into dst buffer, limiting the copy length by dst_len.
* Handles both null-terminated and non null-terminated strings based on
* src_len. Ensures null-termination in dst if dst_len > 0.
*
* @param dst Destination buffer
* @param src Source string
* @param dst_len Size of dst buffer
* @param src_len Length of src string
*
* @return Length of src string
*/
size_t ndpi_strlcpy(char* dst, const char* src, size_t dst_len);
size_t ndpi_strlcpy(char* dst, const char* src, size_t dst_len, size_t src_len);
#ifdef __cplusplus
}
+27 -24
View File
@@ -11376,45 +11376,48 @@ char *ndpi_dump_config(struct ndpi_detection_module_struct *ndpi_str,
void* ndpi_memmem(const void* haystack, size_t haystack_len, const void* needle, size_t needle_len)
{
if (!haystack || !needle) {
return NULL;
}
if (needle_len > haystack_len) {
return NULL;
}
if ((size_t)(const u_int8_t*)haystack+haystack_len < haystack_len) {
if (!haystack || !needle || haystack_len < needle_len || needle_len == 0) {
return NULL;
}
if (needle_len == 1) {
return memchr(haystack, *(int*)needle, haystack_len);
return (void *)memchr(haystack, *(const u_int8_t *)needle, haystack_len);
}
const u_int8_t* h = NULL;
const u_int8_t* n = (const u_int8_t*)needle;
for (h = haystack; h <= (const u_int8_t*)haystack+haystack_len-needle_len; ++h) {
if (*h == n[0] && !memcmp(h, needle, needle_len))
return (void*)h;
const u_int8_t *current = (const u_int8_t *)haystack;
const u_int8_t *haystack_end = (const u_int8_t *)haystack + haystack_len;
while (current <= haystack_end - needle_len) {
/* Find the first occurrence of the first character from the needle */
current = (const u_int8_t *)memchr(current, *(const u_int8_t *)needle,
haystack_end - current);
if (!current) {
return NULL;
}
/* Check the rest of the needle for a match */
if ((current + needle_len <= haystack_end) &&
(memcmp(current, needle, needle_len) == 0)) {
return (void *)current;
}
/* Shift one character to the right for the next search */
current++;
}
return NULL;
}
size_t ndpi_strlcpy(char *dst, const char* src, size_t dst_len)
size_t ndpi_strlcpy(char *dst, const char* src, size_t dst_len, size_t src_len)
{
if (!dst || !src) {
if (!dst || !src || dst_len == 0) {
return 0;
}
size_t src_len = strlen(src);
if (dst_len != 0) {
size_t len = (src_len < dst_len - 1) ? src_len : dst_len - 1;
memcpy(dst, src, len);
dst[len] = '\0';
}
size_t copy_len = ndpi_min(src_len, dst_len - 1);
memmove(dst, src, copy_len);
dst[copy_len] = '\0';
return src_len;
}