From 8d858ac3c89632e6153a03ea5170757617bdddd6 Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Thu, 17 Aug 2023 12:11:51 +0200
Subject: [PATCH] issue 719: fix Decoder crash after call to goto to cleanup;
 under FIX_719_CRASH_IN_CLEANUP

---
 lib_com/options.h       | 2 ++
 lib_dec/ivas_init_dec.c | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index b556709497..6040e4ed85 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -158,6 +158,8 @@
 #define OSBA_SPLIT_RENDERING
 #endif
 
+#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */
+
 
 /* ################## End BE DEVELOPMENT switches ######################### */
 
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 1f401bb420..779c3d390e 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2438,7 +2438,11 @@ void ivas_initialize_handles_dec(
     st_ivas->hJbmMetadata = NULL;
 
     /*  floating-point output audio buffers */
+#ifdef FIX_719_CRASH_IN_CLEANUP
+    for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
+#else
     for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+#endif
     {
         st_ivas->p_output_f[i] = NULL;
     }
-- 
GitLab