diff options
| -rw-r--r-- | src/lib/ndpi_main.c | 8 | ||||
| -rw-r--r-- | src/lib/ndpi_utils.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 43e13201a..686de7798 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2263,14 +2263,14 @@ int ndpi_match_custom_category(struct ndpi_detection_module_struct *ndpi_struct, int ndpi_get_custom_category_match(struct ndpi_detection_module_struct *ndpi_struct, char *name_or_ip, unsigned long *id) { - char ipbuf[64]; + char ipbuf[64], *ptr; struct in_addr pin; if(!ndpi_struct->custom_categories.categories_loaded) return -1; - - strncpy(ipbuf, name_or_ip, sizeof(ipbuf)); - char *ptr = strrchr(ipbuf, '/'); + + snprintf(ipbuf, sizeof(ipbuf)-1, "%s", name_or_ip); + ptr = strrchr(ipbuf, '/'); if(ptr) ptr[0] = '\0'; diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index 82e990883..76a91e0e3 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -874,9 +874,9 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *serializer, } if(serializer->fmt == ndpi_serialization_format_json) { - serializer->size_used += snprintf((char*)serializer->buffer, buff_diff, "%s\"%u\":%lu", + serializer->size_used += snprintf((char*)serializer->buffer, buff_diff, "%s\"%u\":%llu", (serializer->size_used > 2) ? "," : "", - key, value); + key, (unsigned long long)value); } else { serializer->buffer[serializer->size_used++] = ndpi_serialization_uint32_uint64; @@ -957,9 +957,9 @@ int ndpi_serialize_string_uint64(ndpi_serializer *serializer, serializer->buffer[serializer->size_used++] = ndpi_serialization_string_uint64; if(serializer->fmt == ndpi_serialization_format_json) { - serializer->size_used += snprintf((char*)serializer->buffer, buff_diff, "%s\"%s\":%lu", + serializer->size_used += snprintf((char*)serializer->buffer, buff_diff, "%s\"%s\":%llu", (serializer->size_used > 2) ? "," : "", - key, value); + key, (unsigned long long)value); } else { ndpi_serialize_single_string(serializer, key, klen); ndpi_serialize_single_uint64(serializer, value); |