frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed convertCharacterTable() in case iconv_open() fails

Browse Source
This commit is contained in:
Klaus Schmidinger
2020-12-19 14:41:41 +01:00
parent f4739f89bf
commit 9a650a4772
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsi/si.c
View File

@@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* $Id: si.c 4.2 2020/05/15 11:31:40 kls Exp $
* $Id: si.c 4.3 2020/12/19 14:41:41 kls Exp $
* *
***************************************************************************/
@@ -413,6 +413,7 @@ static int Utf8CharLen(const char *s)
size_t convertCharacterTable(const char *from, size_t fromLength, char *to, size_t toLength, const char *fromCode)
{
bool converted = false;
char *result = to;
if (SystemCharacterTable && fromCode) {
iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
@@ -433,9 +434,10 @@ size_t convertCharacterTable(const char *from, size_t fromLength, char *to, size
}
*to = 0;
iconv_close(cd);
converted = true;
}
}
else {
if (!converted) {
size_t len = fromLength;
if (len >= toLength)
len = toLength - 1;