summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-08-15 14:18:26 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2007-08-15 14:18:26 +0200
commite48d4293e565867aeb823f5671ccc4c6abfc4700 (patch)
tree54ff8830cac28ef86dd57d28cc744da5855688e2
parent3883fb8e16514df9b099b88ede426350165b3dbb (diff)
downloadvdr-e48d4293e565867aeb823f5671ccc4c6abfc4700.tar.gz
vdr-e48d4293e565867aeb823f5671ccc4c6abfc4700.tar.bz2
Checking the string for NULL in I18nTranslate()
-rw-r--r--HISTORY1
-rw-r--r--i18n.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 4ce1ac7b..422d6e15 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5361,3 +5361,4 @@ Video Disk Recorder Revision History
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Added internationalization to the "skincurses" plugin (thanks to Rolf
Ahrenberg).
+- Checking the string for NULL in I18nTranslate().
diff --git a/i18n.c b/i18n.c
index 1673e539..7bd27806 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.c 1.308 2007/08/12 12:15:29 kls Exp $
+ * $Id: i18n.c 1.309 2007/08/15 14:17:56 kls Exp $
*
*
*/
@@ -180,6 +180,8 @@ const cStringList *I18nLanguages(void)
const char *I18nTranslate(const char *s, const char *Plugin)
{
+ if (!s)
+ return s;
if (CurrentLanguage) {
const char *t = s;
if (Plugin)