Merge topic branch t/overflow into master

[paraslash.git] / afh_recv.c

diff --git a/afh_recv.c b/afh_recv.c
index 889fdce821f4b9aec85c1b01976e4fae6e05e176..eebac67f9c80a270cd91337190ed9ad1eb569898 100644 (file)
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -75,7 +75,7 @@ static int afh_recv_open(struct receiver_node *rn)
 
        if (!fn || *fn == '\0')
                return -E_AFH_RECV_BAD_FILENAME;
-       rn->private_data = pard = para_calloc(sizeof(*pard));
+       rn->private_data = pard = zalloc(sizeof(*pard));
        afhi = &pard->afhi;
        ret = mmap_full_file(fn, O_RDONLY, &pard->map,
                &pard->map_size, &pard->fd);
@@ -188,7 +188,7 @@ static int afh_recv_post_monitor(__a_unused struct sched *s, void *context)
                        pard->map_size, &header, &size);
                if (size > 0) {
                        PARA_INFO_LOG("writing header (%zu bytes)\n", size);
-                       buf = para_malloc(size);
+                       buf = alloc(size);
                        memcpy(buf, header, size);
                        btr_add_output(buf, size, btrn);
                        afh_free_header(header, pard->audio_format_num);