Received-SPF: pass (google.com: domain of linux-kernel+bounces-143737-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: tskd08@gmail.com
To: linux-media@vger.kernel.org
Cc: mchehab@kernel.org,
	linux-kernel@vger.kernel.org,
	Akihiro Tsukada <tskd08@gmail.com>
Subject: [PATCH] v4l-utils/contrib/gconv: fix conversion errors on ARIB-STD-B24 strings
Date: Sat, 13 Apr 2024 22:36:01 +0900
Message-ID: <20240413133601.66531-1-tskd08@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

From: Akihiro Tsukada <tskd08@gmail.com>

Some ARIB strings in operation requires that
codepoints from the 'extra symbols' charset fallback to 'kanji'.
Remove the range check for 'extra symbols' to accept those strings.

Signed-off-by: Akihiro Tsukada <tskd08@gmail.com>
---
 contrib/gconv/arib-std-b24.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/gconv/arib-std-b24.c b/contrib/gconv/arib-std-b24.c
index 6a2e6292..18f06283 100644
--- a/contrib/gconv/arib-std-b24.c
+++ b/contrib/gconv/arib-std-b24.c
@@ -494,8 +494,10 @@ b24_char_conv (int set, unsigned char c1, unsigned char c2, uint32_t *out)
 
 	    return 1;
 	  }
-	if (set == EXTRA_SYMBOLS_set)
-	  return 0;
+	/* Some ARIB strings somehow require that
+	 * EXTRA_SYMBOLS codepoints fallback to KANJI_set.
+	 * so just fall through here.
+	 */
 
 	/* non-JISX0213 modification. (combining chars) */
 	if (c1 == 0x22 && c2 == 0x7e)
-- 
2.44.0