|
|
@ -145,10 +145,10 @@ json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff,
|
|
|
|
return NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
char *s = BytesToString(ff->name, ff->name_len);
|
|
|
|
size_t filename_size = ff->name_len * 2 + 1;
|
|
|
|
json_object_set_new(fjs, "filename", SCJsonString(s));
|
|
|
|
char filename_string[filename_size];
|
|
|
|
if (s != NULL)
|
|
|
|
BytesToStringBuffer(ff->name, ff->name_len, filename_string, filename_size);
|
|
|
|
SCFree(s);
|
|
|
|
json_object_set_new(fjs, "filename", SCJsonString(filename_string));
|
|
|
|
#ifdef HAVE_MAGIC
|
|
|
|
#ifdef HAVE_MAGIC
|
|
|
|
if (ff->magic)
|
|
|
|
if (ff->magic)
|
|
|
|
json_object_set_new(fjs, "magic", json_string((char *)ff->magic));
|
|
|
|
json_object_set_new(fjs, "magic", json_string((char *)ff->magic));
|
|
|
|