From 59253bafcf76cfd8c672fbcf5f195b00ff3c9a50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 13 Nov 2012 22:48:53 +0200 Subject: [PATCH] aout: fix infinite loop on error (fixes #7711) --- src/audio_output/dec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index 8d72e27fff..348bc437b5 100644 --- a/src/audio_output/dec.c +++ b/src/audio_output/dec.c @@ -67,7 +67,6 @@ int aout_DecNew( audio_output_t *p_aout, } aout_owner_t *owner = aout_owner(p_aout); - int ret = 0; /* TODO: reduce lock scope depending on decoder's real need */ aout_lock( p_aout ); @@ -92,8 +91,8 @@ int aout_DecNew( audio_output_t *p_aout, aout_OutputDelete (p_aout); error: aout_volume_Delete (owner->volume); - ret = -1; - goto error; + aout_unlock (p_aout); + return -1; } owner->sync.end = VLC_TS_INVALID; @@ -102,8 +101,7 @@ error: aout_unlock( p_aout ); atomic_init (&owner->buffers_lost, 0); - - return ret; + return 0; } /** -- 2.39.2