This commit is contained in:
Alfredo Cardigliano
2021-02-19 09:27:24 +01:00
parent 92e8d95f38
commit e9350d8fc7
+9 -9
View File
@@ -483,7 +483,7 @@ static int ndpi_string_to_automa(struct ndpi_detection_module_struct *ndpi_str,
char buf[96]; char buf[96];
u_int len, dot; u_int len, dot;
if((value == NULL) || (protocol_id >= (NDPI_MAX_SUPPORTED_PROTOCOLS + NDPI_MAX_NUM_CUSTOM_PROTOCOLS))) { if(protocol_id >= (NDPI_MAX_SUPPORTED_PROTOCOLS + NDPI_MAX_NUM_CUSTOM_PROTOCOLS)) {
NDPI_LOG_ERR(ndpi_str, "[NDPI] protoId=%d: INTERNAL ERROR\n", protocol_id); NDPI_LOG_ERR(ndpi_str, "[NDPI] protoId=%d: INTERNAL ERROR\n", protocol_id);
return(-1); return(-1);
} }
@@ -494,15 +494,17 @@ static int ndpi_string_to_automa(struct ndpi_detection_module_struct *ndpi_str,
len = strlen(value); len = strlen(value);
dot = len -1; dot = len -1;
if((!add_ends_with) || ndpi_is_middle_string_char(value[dot])) if((!add_ends_with) || ndpi_is_middle_string_char(value[dot])) {
ac_pattern.astring = value, ac_pattern.length = len; ac_pattern.length = len;
else { ac_pattern.astring = value;
} else {
u_int mlen = sizeof(buf)-2; u_int mlen = sizeof(buf)-2;
len = ndpi_min(len, mlen); len = ndpi_min(len, mlen);
ac_pattern.length = snprintf(buf, mlen, "%s$", value); ac_pattern.length = snprintf(buf, mlen, "%s$", value);
ac_pattern.astring = ndpi_strdup(buf); free(value);
free_str_on_duplicate = 1; value = ndpi_strdup(buf);
ac_pattern.astring = value;
} }
ac_pattern.rep.number = protocol_id, ac_pattern.rep.category = (u_int16_t) category, ac_pattern.rep.breed = (u_int16_t) breed; ac_pattern.rep.number = protocol_id, ac_pattern.rep.category = (u_int16_t) category, ac_pattern.rep.breed = (u_int16_t) breed;
@@ -513,10 +515,8 @@ static int ndpi_string_to_automa(struct ndpi_detection_module_struct *ndpi_str,
#endif #endif
rc = ac_automata_add(((AC_AUTOMATA_t *) automa->ac_automa), &ac_pattern); rc = ac_automata_add(((AC_AUTOMATA_t *) automa->ac_automa), &ac_pattern);
if((rc != ACERR_DUPLICATE_PATTERN) && (rc != ACERR_SUCCESS)) { if((rc != ACERR_DUPLICATE_PATTERN) && (rc != ACERR_SUCCESS))
if(free_str_on_duplicate) ndpi_free(value);
return(-2); return(-2);
}
if((rc == ACERR_DUPLICATE_PATTERN) && free_str_on_duplicate) if((rc == ACERR_DUPLICATE_PATTERN) && free_str_on_duplicate)
ndpi_free(value); ndpi_free(value);