mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a memory leak

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1582 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-06 17:37:59 +00:00
parent 62790ccdb4
commit 455ff8d342
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/pulsecore/pstream.c
View file

@ -274,7 +274,7 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo
return p; return p;
} }
static void item_free(void *item, PA_GCC_UNUSED void *p) { static void item_free(void *item, PA_GCC_UNUSED void *q) {
struct item_info *i = item; struct item_info *i = item;
pa_assert(i); pa_assert(i);
@ -299,15 +299,15 @@ static void pstream_free(pa_pstream *p) {
if (p->write.current) if (p->write.current)
item_free(p->write.current, NULL); item_free(p->write.current, NULL);
if (p->write.memchunk.memblock)
pa_memblock_unref(p->write.memchunk.memblock);
if (p->read.memblock) if (p->read.memblock)
pa_memblock_unref(p->read.memblock); pa_memblock_unref(p->read.memblock);
if (p->read.packet) if (p->read.packet)
pa_packet_unref(p->read.packet); pa_packet_unref(p->read.packet);
if (p->write.memchunk.memblock)
pa_memblock_unref(p->write.memchunk.memblock);
pa_xfree(p); pa_xfree(p);
} }
@ -568,9 +568,14 @@ static int do_write(pa_pstream *p) {
if (p->write.index >= PA_PSTREAM_DESCRIPTOR_SIZE + ntohl(p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH])) { if (p->write.index >= PA_PSTREAM_DESCRIPTOR_SIZE + ntohl(p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH])) {
pa_assert(p->write.current); pa_assert(p->write.current);
item_free(p->write.current, (void *) 1); item_free(p->write.current, NULL);
p->write.current = NULL; p->write.current = NULL;
if (p->write.memchunk.memblock)
pa_memblock_unref(p->write.memchunk.memblock);
pa_memchunk_reset(&p->write.memchunk);
if (p->drain_callback && !pa_pstream_is_pending(p)) if (p->drain_callback && !pa_pstream_is_pending(p))
p->drain_callback(p, p->drain_callback_userdata); p->drain_callback(p, p->drain_callback_userdata);
} }