Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-08 12:37:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix vorbis & opus memory leaks

Browse Source
This commit is contained in:
philippe44
2023-10-27 18:26:57 -07:00
parent b5b76480e4
commit 986521fd4a
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,3 +1,6 @@
2023-10-27
- fix vorbis (and opus) memory leak
2023-10-23 2023-10-23
- fix Spotify track insertion - fix Spotify track insertion
- [WEB] Allow running without LMS with option "Audio/Disable Squeezelite" - [WEB] Allow running without LMS with option "Audio/Disable Squeezelite"

16
components/squeezelite/opus.c
View File

@@ -186,7 +186,7 @@ static int read_opus_header(void) {
switch (u->status) { switch (u->status) {
case OGG_SYNC: case OGG_SYNC:
u->status = OGG_ID_HEADER; u->status = OGG_ID_HEADER;
OG(&gu, stream_init, &u->state, OG(&gu, page_serialno, &u->page)); OG(&gu, stream_reset_serialno, &u->state, OG(&gu, page_serialno, &u->page));
fetch = false; fetch = false;
break; break;
case OGG_ID_HEADER: case OGG_ID_HEADER:
@@ -359,10 +359,10 @@ static void opus_open(u8_t size, u8_t rate, u8_t chan, u8_t endianness) {
u->status = OGG_SYNC; u->status = OGG_SYNC;
u->overframes = 0; u->overframes = 0;
OG(&gu, sync_clear, &u->sync); OG(&go, stream_clear, &u->state);
OG(&gu, stream_clear, &u->state); OG(&go, sync_clear, &u->sync);
OG(&gu, stream_init, &u->state, -1); OG(&go, stream_init, &u->state, -1);
} }
static void opus_close(void) { static void opus_close(void) {
@@ -372,8 +372,8 @@ static void opus_close(void) {
free(u->overbuf); free(u->overbuf);
u->overbuf = NULL; u->overbuf = NULL;
OG(&gu, stream_clear, &u->state); OG(&go, stream_clear, &u->state);
OG(&gu, sync_clear, &u->sync); OG(&go, sync_clear, &u->sync);
} }
static bool load_opus(void) { static bool load_opus(void) {
@@ -394,7 +394,7 @@ static bool load_opus(void) {
} }
g_handle->ogg_stream_clear = dlsym(g_handle->handle, "ogg_stream_clear"); g_handle->ogg_stream_clear = dlsym(g_handle->handle, "ogg_stream_clear");
g_handle->.ogg_stream_reset = dlsym(g_handle->handle, "ogg_stream_reset"); g_handle->ogg_stream_reset = dlsym(g_handle->handle, "ogg_stream_reset");
g_handle->ogg_stream_eos = dlsym(g_handle->handle, "ogg_stream_eos"); g_handle->ogg_stream_eos = dlsym(g_handle->handle, "ogg_stream_eos");
g_handle->ogg_stream_reset_serialno = dlsym(g_handle->handle, "ogg_stream_reset_serialno"); g_handle->ogg_stream_reset_serialno = dlsym(g_handle->handle, "ogg_stream_reset_serialno");
g_handle->ogg_sync_clear = dlsym(g_handle->handle, "ogg_sync_clear"); g_handle->ogg_sync_clear = dlsym(g_handle->handle, "ogg_sync_clear");

36
components/squeezelite/vorbis.c
View File

@@ -72,6 +72,13 @@ static struct vorbis {
// vorbis symbols to be dynamically loaded - from either vorbisfile or vorbisidec (tremor) version of library // vorbis symbols to be dynamically loaded - from either vorbisfile or vorbisidec (tremor) version of library
vorbis_info *(* ov_info)(OggVorbis_File *vf, int link); vorbis_info *(* ov_info)(OggVorbis_File *vf, int link);
int (* ov_clear)(OggVorbis_File *vf); int (* ov_clear)(OggVorbis_File *vf);
void (* ov_info_init)(vorbis_info* vi);
void (* ov_info_clear)(vorbis_info* vi);
void (* ov_comment_init)(vorbis_comment* vc);
void (* ov_comment_clear(vorbis_comment *vc);
int (* ov_block_init)(vorbis_dsp_state* v, vorbis_block* vb);
int (* ov_block_clear)(vorbis_block* vb);
void (* ov_vorbis_dsp_clear)(vorbis_dsp_state* v);
long (* ov_read)(OggVorbis_File *vf, char *buffer, int length, int bigendianp, int word, int sgned, int *bitstream); long (* ov_read)(OggVorbis_File *vf, char *buffer, int length, int bigendianp, int word, int sgned, int *bitstream);
long (* ov_read_tremor)(OggVorbis_File *vf, char *buffer, int length, int *bitstream); long (* ov_read_tremor)(OggVorbis_File *vf, char *buffer, int length, int *bitstream);
int (* ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks); int (* ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks);
@@ -397,29 +404,31 @@ static decode_state vorbis_decode(void) {
static void vorbis_open(u8_t size, u8_t rate, u8_t chan, u8_t endianness) { static void vorbis_open(u8_t size, u8_t rate, u8_t chan, u8_t endianness) {
if (v->opened) { if (v->opened) {
OV(&go, block_clear, &v->block); OV(&gv, block_clear, &v->block);
OV(&go, info_clear, &v->info); OV(&gv, dsp_clear, &v->decoder);
OV(&go, dsp_clear, &v->decoder); OV(&gv, info_clear, &v->info);
} }
v->opened = false; v->opened = false;
v->status = OGG_SYNC; v->status = OGG_SYNC;
v->overflow = 0; v->overflow = 0;
OG(&gu, sync_clear, &v->sync); OG(&go, stream_clear, &v->state);
OG(&gu, stream_clear, &v->state); OG(&go, sync_clear, &v->sync);
OG(&gu, stream_init, &v->state, -1); OG(&go, stream_init, &v->state, -1);
} }
static void vorbis_close() { static void vorbis_close() {
if (v->opened) { if (v->opened) {
OV(&go, block_clear, &v->block); OV(&gv, block_clear, &v->block);
OV(&go, info_clear, &v->info); OV(&gv, dsp_clear, &v->decoder);
OV(&go, dsp_clear, &v->decoder); // info must be last otherwise there is memory leak (where is it said... nowhere)
OV(&gv, info_clear, &v->info);
// we don' t have comments to free
} }
v->opened = false; v->opened = false;
OG(&go, stream_clear, &v->state); OG(&go, stream_clear, &v->state);
OG(&go, sync_clear, &v->sync); OG(&go, sync_clear, &v->sync);
} }
@@ -466,6 +475,11 @@ static bool load_vorbis() {
v_handle.ov_read = dlsym(handle, "ov_read"); v_handle.ov_read = dlsym(handle, "ov_read");
v_handle.ov_info = dlsym(handle, "ov_info"); v_handle.ov_info = dlsym(handle, "ov_info");
v_handle.ov_clear = dlsym(handle, "ov_clear"); v_handle.ov_clear = dlsym(handle, "ov_clear");
v.handle.ov_info_clear = dlsym(gv.handle, "vorbis_info_clear");
v.handle.ov_comment_init = dlsym(gv.handle, "vorbis_comment_init");
v.handle.ov_comment_clear = dlsym(gv.handle, "vorbis_comment_clear");
v.handle.ov_block_init = dlsym(gv.handle, "vorbis_block_init");
v.handle.ov_block_clear = dlsym(gv.handle, "vorbis_block_clear");
v_handle.ov_open_callbacks = dlsym(handle, "ov_open_callbacks"); v_handle.ov_open_callbacks = dlsym(handle, "ov_open_callbacks");
if ((err = dlerror()) != NULL) { if ((err = dlerror()) != NULL) {