From d79a617ceddfa18dd8d9adfa379e8370ae3d302f Mon Sep 17 00:00:00 2001
From: Charles Kinuthia <charles.kinuthia@ericsson.com>
Date: Mon, 8 May 2023 16:51:39 +0200
Subject: [PATCH] Fix incorrect use of stack variable used for channel aware
 config file

---
 apps/encoder.c    | 13 +++++++++++++
 lib_com/options.h |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/apps/encoder.c b/apps/encoder.c
index 91932dd8af..7f6d6baa30 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -1130,18 +1130,31 @@ static bool parseCmdlIVAS_enc(
             {
                 strncpy( stmp, argv[i], sizeof( stmp ) );
                 stmp[sizeof( stmp ) - 1] = '\0';
+#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING
+                to_upper( stmp );
+                if ( strcmp( stmp, "LO" ) == 0 )
+#else
                 to_upper( argv[i] );
                 if ( strcmp( argv[i], "LO" ) == 0 )
+#endif
                 {
                     arg->caConfig.fec_indicator = IVAS_ENC_FEC_LO;
                 }
+#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING
+                else if ( strcmp( stmp, "HI" ) == 0 )
+#else
                 else if ( strcmp( argv[i], "HI" ) == 0 )
+#endif
                 {
                     arg->caConfig.fec_indicator = IVAS_ENC_FEC_HI;
                 }
                 else
                 {
+#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING
+                    arg->ca_config_file = argv[i];
+#else
                     arg->ca_config_file = stmp;
+#endif
                 }
                 i++;
 
diff --git a/lib_com/options.h b/lib_com/options.h
index 9fe797240d..d2b920fd75 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -177,6 +177,8 @@
 #define FIX_435_ISM_MERGE_BUG                           /* Eri: Merge bug fix for ISM NULL metadata and tcx_only cases */
 #define FIX_355_REFACTOR_PARAMBIN_TO_5MS                /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */
 
+#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING         /* Eri: Fix incorrect use of stack variable used for channel aware config file */
+
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
 #endif
-- 
GitLab