2 files changed, 2 insertions, 1 deletions
diff --git a/setupeepg.c b/setupeepg.c
index 54f8243..38f5b90 100644
--- a/setupeepg.c
+++ b/setupeepg.c
@@ -13,6 +13,7 @@
 cSetupEEPG* cSetupEEPG::_setupEEPG = NULL;
 
 cSetupEEPG::cSetupEEPG (void)
+:ConfDir(NULL)
 {
   OptPat = 1;
   OrderInfo = 1;
diff --git a/util.c b/util.c
index 92164a6..428aeb8 100644
--- a/util.c
+++ b/util.c
@@ -121,7 +121,7 @@ void CleanString (unsigned char *String)
     }
     Src++;
   }
-  if (Spaces > 0) {
+  if (Spaces > 0 && String > Dst) {
     Dst--;
     *Dst = 0;
   } else {