Commit 86aec3c8 authored by multrus's avatar multrus
Browse files

avoid accessing NULL handle

parent 29c43114

lib_dec/core_switching_dec_fx.c

+9 −1
Original line number Diff line number Diff line
@@ -1630,17 +1630,25 @@ ivas_error core_switching_post_dec_ivas_fx( 
            test();

            IF( EQ_16( st_fx->last_core, HQ_CORE ) || st_fx->last_core == TCX_20_CORE || st_fx->last_core == TCX_10_CORE ) /*  MDCT to ACELP transition */

            {

#ifdef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES

                Word16 Q_old_postdec = 0;

                move16();

#endif

                Qtmp = s_min( *Qsynth, 0 );

                IF( hHQ_core != NULL )

                {

                    Qtmp = s_min( s_min( *Qsynth, hHQ_core->Q_old_postdec ), hHQ_core->Q_old_wtda );

#ifdef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES

                    Q_old_postdec = hHQ_core->Q_old_postdec;

                    move16();

#endif

                }



                Scale_sig( synth, output_frame, sub( Qtmp, *Qsynth ) ); /* Qtmp */

#ifndef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES

                Scale_sig( st_fx->delay_buf_out_fx, delay_comp, Qtmp ); /*delay buff_out_fx is Q0*/

#else

                Scale_sig( st_fx->delay_buf_out_fx, delay_comp, sub( Qtmp, hHQ_core->Q_old_postdec ) ); /*delay buff_out_fx is Qtmp*/

                Scale_sig( st_fx->delay_buf_out_fx, delay_comp, sub( Qtmp, Q_old_postdec ) ); /* delay buff_out_fx is Qtmp */

#endif

                IF( hHQ_core != NULL )

                {