1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed checking iconv_open() return value

This commit is contained in:
Klaus Schmidinger 2007-05-28 10:22:42 +02:00
parent df463b5a2a
commit 32dd727d05

View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* $Id: si.c 1.18 2007/04/22 13:56:39 kls Exp $ * $Id: si.c 1.19 2007/05/28 10:22:42 kls Exp $
* * * *
***************************************************************************/ ***************************************************************************/
@ -370,7 +370,7 @@ static bool convertCharacterTable(const char *from, size_t fromLength, char *to,
{ {
if (SystemCharacterTable) { if (SystemCharacterTable) {
iconv_t cd = iconv_open(SystemCharacterTable, fromCode); iconv_t cd = iconv_open(SystemCharacterTable, fromCode);
if (cd >= 0) { if (cd != (iconv_t)-1) {
char *fromPtr = (char *)from; char *fromPtr = (char *)from;
while (fromLength > 0 && toLength > 1) { while (fromLength > 0 && toLength > 1) {
if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) { if (iconv(cd, &fromPtr, &fromLength, &to, &toLength) == size_t(-1)) {