From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 6 Jan 2018 10:04:28 +0000 (+0100)
Subject: en50221: another fix for parsing CAIDs, issue #4400
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=132fb02fcbf513dae077c22d51d2dbc5dadeda53;p=thirdparty%2Ftvheadend.git

en50221: another fix for parsing CAIDs, issue #4400
---

diff --git a/src/input/mpegts/en50221/en50221_apps.c b/src/input/mpegts/en50221/en50221_apps.c
index 240b25f68..ff12d85f6 100644
--- a/src/input/mpegts/en50221/en50221_apps.c
+++ b/src/input/mpegts/en50221/en50221_apps.c
@@ -154,7 +154,8 @@ en50221_app_ca_handle
 
   if (atag == CICAM_AOT_CA_INFO) {
     count = 0;
-    for (; count < sizeof(app->cia_caids) - 1 && datalen > 1; count++, datalen -= 2)
+    for (; count < ARRAY_SIZE(app->cia_caids) - 1 && datalen > 1;
+         data += 2, datalen -= 2, count++)
       app->cia_caids[count] = (data[0] << 8) | data[1];
     if (datalen) {
       app->cia_caids[0] = 0;