commit a995269c6dd98c397d194325a0f1250fd869c290
author Vadim Yanitskiy <vyanitskiy@sysmocom.de> Fri Nov 10 03:31:55 2023 +0700
committer fixeria <vyanitskiy@sysmocom.de> Tue Nov 14 11:57:19 2023 +0000
tree cca22b55ad4a5b01f2464da748b0fd92589498c6
parent e0d0fff41f6ab6b6164cfb96f1cb0e18864db3de

coding: gsm0503_tch_a[fh]s_encode(): improve cmr/ft checks

Change-Id: If03d5b015ab1c8db56a4c67bdc8e36e260c06562

src/coding/gsm0503_coding.c

diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c
index 0e7f689..f8840c9 100644
--- a/src/coding/gsm0503_coding.c
+++ b/src/coding/gsm0503_coding.c
@@ -2465,19 +2465,11 @@
 
 	h = 0;
 
-	if (codec_mode_req) {
-		if (cmr >= codecs) {
-			/* FIXME: CMR ID is not in codec list! */
-			return -1;
-		}
-		id = cmr;
-	} else {
-		if (ft >= codecs) {
-			/* FIXME: FT ID is not in codec list! */
-			return -1;
-		}
-		id = ft;
-	}
+	id = codec_mode_req ? cmr : ft;
+	if (OSMO_UNLIKELY(id >= ARRAY_SIZE(gsm0503_afs_ic_ubit)))
+		return -1;
+	if (OSMO_UNLIKELY(ft >= codecs))
+		return -1;
 
 	switch (codec[ft]) {
 	case 7: /* TCH/AFS12.2 */
@@ -2970,19 +2962,11 @@
 
 	h = 0;
 
-	if (codec_mode_req) {
-		if (cmr >= codecs) {
-			/* FIXME: CMR ID %d not in codec list */
-			return -1;
-		}
-		id = cmr;
-	} else {
-		if (ft >= codecs) {
-			/* FIXME: FT ID %d not in codec list */
-			return -1;
-		}
-		id = ft;
-	}
+	id = codec_mode_req ? cmr : ft;
+	if (OSMO_UNLIKELY(id >= ARRAY_SIZE(gsm0503_ahs_ic_ubit)))
+		return -1;
+	if (OSMO_UNLIKELY(ft >= codecs))
+		return -1;
 
 	switch (codec[ft]) {
 	case 5: /* TCH/AHS7.95 */