From 1d2df400b5e1479b0e552847af80b62343ec91c3 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 23 Oct 2014 18:10:49 +0200 Subject: [PATCH] dvb support: more fixes in conv_utf8() - fixes#2414 - add ucs2 for 0x14 - fix the first character skip for 0x15 (utf8) --- src/input/mpegts/dvb_support.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/input/mpegts/dvb_support.c b/src/input/mpegts/dvb_support.c index cf67bb0bf..7af24e5b3 100644 --- a/src/input/mpegts/dvb_support.c +++ b/src/input/mpegts/dvb_support.c @@ -99,7 +99,7 @@ static inline size_t conv_UCS2(const uint8_t *src, size_t srclen,char *dst, size } static inline size_t conv_utf8(const uint8_t *src, size_t srclen, - char *dst, size_t *dstlen) + char *dst, size_t *dstlen) { while (srclen>0 && (*dstlen)>0) { *dst = (char) *src; @@ -270,6 +270,7 @@ dvb_get_string break; case 0x0c ... 0x0f: + src++; srclen--; break; case 0x10: /* Table A.4 */ @@ -291,13 +292,21 @@ dvb_get_string break; case 0x12: + src++; srclen--; + break; + case 0x14: + ic = convert_ucs2; + src++; srclen--; break; case 0x15: ic = convert_utf8; + src++; srclen--; break; + case 0x16 ... 0x1f: + src++; srclen--; break; default: -- 2.47.3