Skip to content

Fix a memory access error and some leaks #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IvanNardi merged 1 commit into from
May 8, 2024
Merged

Fix a memory access error and some leaks #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/ndpi_domains.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const char* ndpi_get_host_domain(struct ndpi_detection_module_struct *ndpi_str,

dot = strstr(hostname, ret);

if(dot == NULL)
if(dot == NULL || dot == hostname)
return(hostname);

dot--;
Expand Down
9 changes: 8 additions & 1 deletion src/lib/ndpi_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,7 @@ int ndpi_hash_find_entry(ndpi_str_hash *h, char *key, u_int key_len, u_int16_t *

int ndpi_hash_add_entry(ndpi_str_hash **h, char *key, u_int8_t key_len, u_int16_t value) {
ndpi_str_hash_priv *h_priv = (ndpi_str_hash_priv *)*h;
ndpi_str_hash_priv *item;
ndpi_str_hash_priv *item, *ret_found;

if(!key || key_len == 0)
return(3);
Expand Down Expand Up @@ -2350,6 +2350,13 @@ int ndpi_hash_add_entry(ndpi_str_hash **h, char *key, u_int8_t key_len, u_int16_

HASH_ADD(hh, *((ndpi_str_hash_priv **)h), key[0], key_len, item);

HASH_FIND(hh, *((ndpi_str_hash_priv **)h), key, key_len, ret_found);
if(ret_found == NULL) { /* The insertion failed (because of a memory allocation error) */
ndpi_free(item->key);
ndpi_free(item);
return 4;
}

return 0;
}

Expand Down