summaryrefslogtreecommitdiff
path: root/tools.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-06-15 13:01:18 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2007-06-15 13:01:18 +0200
commit1f7c70cd49046525519cc84cb118d246c71569dc (patch)
treed204cb8c4962a0d260b16da05b3a164cc36725e3 /tools.c
parent3224fffe8751732ec3304d8f540e832929933f27 (diff)
downloadvdr-1f7c70cd49046525519cc84cb118d246c71569dc.tar.gz
vdr-1f7c70cd49046525519cc84cb118d246c71569dc.tar.bz2
Fixed a crash in i18n character set conversion
Diffstat (limited to 'tools.c')
-rw-r--r--tools.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools.c b/tools.c
index 4498e6ae..465335ae 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.c 1.124 2007/06/15 12:20:40 kls Exp $
+ * $Id: tools.c 1.125 2007/06/15 12:46:38 kls Exp $
*/
#include "tools.h"
@@ -753,7 +753,7 @@ void cCharSetConv::SetSystemCharacterTable(const char *CharacterTable)
const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
{
- if (cd != (iconv_t)-1) {
+ if (cd != (iconv_t)-1 && From && *From) {
char *FromPtr = (char *)From;
size_t FromLength = strlen(From);
char *ToPtr = To;