diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-04-21 19:04:45 +0200 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-05-14 06:25:44 +0200 |
| commit | 7ef8dda5115d8a2c1157c0438af710c555f40b32 (patch) | |
| tree | dae241a342238ffe91621e1e2609d3d27a858685 /log | |
| parent | b62f35d2355eee2464d1877e8dd0797a92da5c5f (diff) | |
| download | ubox-7ef8dda5115d8a2c1157c0438af710c555f40b32.tar.gz | |
log: make valgrind less complain by freeing allocated memory
Signed-off-by: Luka Perkov <luka@openwrt.org>
Diffstat (limited to 'log')
| -rw-r--r-- | log/logd.c | 5 | ||||
| -rw-r--r-- | log/syslog.c | 1 |
2 files changed, 5 insertions, 1 deletions
@@ -70,6 +70,7 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj, struct log_head *l; int count = 0; int fds[2]; + int ret; if (msg) { blobmsg_parse(&read_policy, 1, &tb, blob_data(msg), blob_len(msg)); @@ -96,7 +97,9 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_u32(&b, "source", l->source); blobmsg_add_u64(&b, "time", l->ts.tv_sec * 1000LL); l = log_list(count, l); - if (ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false) <= 0) + ret = ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false); + blob_buf_free(&b); + if (ret < 0) break; } return 0; diff --git a/log/syslog.c b/log/syslog.c index f75fed9..a596b48 100644 --- a/log/syslog.c +++ b/log/syslog.c @@ -299,4 +299,5 @@ log_shutdown(void) ustream_free(&klog.stream); close(slog.fd.fd); close(klog.fd.fd); + free(log); } |