Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion nmsg/base/dnsqr.c
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@ get_af(const char *addr) {
static char *
addrs_to_bpf(const char *addrs, const char *bpfdir, int af) {
char *ret, *tok_addrs, *addr, *saveptr;
uint8_t *ubuf_str;
size_t retsz;
int addr_af;
ubuf *bpf;
Expand Down Expand Up @@ -815,8 +816,9 @@ addrs_to_bpf(const char *addrs, const char *bpfdir, int af) {

free(tok_addrs);
ubuf_cterm(bpf);
ubuf_detach(bpf, (uint8_t **) &ret, &retsz);
ubuf_detach(bpf, &ubuf_str, &retsz);
ubuf_destroy(&bpf);
ret = (char *)ubuf_str;
return (ret);
}

Expand Down
7 changes: 5 additions & 2 deletions nmsg/input_json.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,23 @@
#if (defined HAVE_JSON_C) && (defined HAVE_LIBRDKAFKA)
nmsg_res
_input_kafka_json_read(nmsg_input_t input, nmsg_message_t *msg) {
uint8_t *ubuf_str;
nmsg_res res;
char *buf;
size_t buf_len;

res = kafka_read_start(input->kafka->ctx, (uint8_t **) &buf, &buf_len);
res = kafka_read_start(input->kafka->ctx, &ubuf_str, &buf_len);
if (res != nmsg_res_success) {
kafka_read_finish(input->kafka->ctx);
return res;
}

buf = (char *)ubuf_str;

if (buf_len == 0)
return nmsg_res_failure;

res = nmsg_message_from_json((const char *) buf, msg);
res = nmsg_message_from_json((const char *)buf, msg);

if (res == nmsg_res_parse_error) {
_nmsg_dprintf(2, "Kafka JSON parse error: \"%s\"\n", buf);
Expand Down