From f20575dd8632d371a51478ff55996d4ecc35ff1e Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Wed, 31 Jan 2024 21:52:08 -0500
Subject: [PATCH] Fix OSCE using uninitialized range coder for PLC
---
silk/decode_frame.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/silk/decode_frame.c b/silk/decode_frame.c
index 48f74aefc..9bc4ca2b0 100644
--- a/silk/decode_frame.c
+++ b/silk/decode_frame.c
@@ -58,17 +58,11 @@ opus_int silk_decode_frame(
{
VARDECL( silk_decoder_control, psDecCtrl );
opus_int L, mv_len, ret = 0;
-#ifdef ENABLE_OSCE
- opus_int32 ec_start;
-#endif
SAVE_STACK;
L = psDec->frame_length;
ALLOC( psDecCtrl, 1, silk_decoder_control );
psDecCtrl->LTP_scale_Q14 = 0;
-#ifdef ENABLE_OSCE
- ec_start = ec_tell(psRangeDec);
-#endif
/* Safety checks */
celt_assert( L > 0 && L <= MAX_FRAME_LENGTH );
@@ -77,6 +71,10 @@ opus_int silk_decode_frame(
( lostFlag == FLAG_DECODE_LBRR && psDec->LBRR_flags[ psDec->nFramesDecoded ] == 1 ) )
{
VARDECL( opus_int16, pulses );
+#ifdef ENABLE_OSCE
+ opus_int32 ec_start;
+ ec_start = ec_tell(psRangeDec);
+#endif
ALLOC( pulses, (L + SHELL_CODEC_FRAME_LENGTH - 1) &
~(SHELL_CODEC_FRAME_LENGTH - 1), opus_int16 );
/*********************************************/
--
GitLab