From 92ccf642a638d0d6600f87f50faaa26e687544e2 Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Thu, 11 Jul 2024 09:37:49 +0200
Subject: [PATCH 1/2] [fix] add missing return statements in encoder
 application cmdl parsing

---
 apps/encoder.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/encoder.c b/apps/encoder.c
index b00f4f75fd..9709ef077b 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -1519,6 +1519,7 @@ static bool parseCmdlIVAS_enc(
                 {
                     fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );
                     usage_enc();
+                    return false;
                 }
                 else
                 {
@@ -1530,6 +1531,7 @@ static bool parseCmdlIVAS_enc(
                     {
                         fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );
                         usage_enc();
+                        return false;
                     }
                 }
             }
@@ -1537,6 +1539,7 @@ static bool parseCmdlIVAS_enc(
             {
                 fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );
                 usage_enc();
+                return false;
             }
             if ( i < argc - 4 )
             {
@@ -1556,6 +1559,7 @@ static bool parseCmdlIVAS_enc(
                     default:
                         fprintf( stderr, "Error: MASA channels must be 1 or 2.\n\n" );
                         usage_enc();
+                        return false;
                         break;
                 }
             }
@@ -1581,6 +1585,7 @@ static bool parseCmdlIVAS_enc(
                 {
                     fprintf( stderr, "Error: not enough arguments\n\n" );
                     usage_enc();
+                    return false;
                 }
             }
 
@@ -1593,6 +1598,7 @@ static bool parseCmdlIVAS_enc(
             {
                 fprintf( stderr, "Error: not enough MASA arguments\n\n" );
                 usage_enc();
+                return false;
             }
         }
         else if ( strcmp( to_upper( argv[i] ), "-ISM_SBA" ) == 0 )
@@ -1611,6 +1617,7 @@ static bool parseCmdlIVAS_enc(
                 {
                     fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );
                     usage_enc();
+                    return false;
                 }
                 else
                 {
@@ -1622,6 +1629,7 @@ static bool parseCmdlIVAS_enc(
                     {
                         fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );
                         usage_enc();
+                        return false;
                     }
                 }
             }
@@ -1629,6 +1637,7 @@ static bool parseCmdlIVAS_enc(
             {
                 fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );
                 usage_enc();
+                return false;
             }
 
             if ( i < argc - 4 )
@@ -1680,6 +1689,7 @@ static bool parseCmdlIVAS_enc(
                 {
                     fprintf( stderr, "Error: not enough arguments\n\n" );
                     usage_enc();
+                    return false;
                 }
             }
         }
-- 
GitLab


From bb4eb32152dea2625bf7e7a2e9a5c0b7dd63809c Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Tue, 16 Jul 2024 11:39:14 +0200
Subject: [PATCH 2/2] remove unreachable break; statement due to return

---
 apps/encoder.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/encoder.c b/apps/encoder.c
index 9709ef077b..f64986ec84 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -1560,7 +1560,6 @@ static bool parseCmdlIVAS_enc(
                         fprintf( stderr, "Error: MASA channels must be 1 or 2.\n\n" );
                         usage_enc();
                         return false;
-                        break;
                 }
             }
 
-- 
GitLab