Now skipping some funny characters sent by some CAMs at the beginning of strings

2 files changed, 8 insertions, 1 deletions

diff --git a/HISTORY b/HISTORY
index 0a3c8f68..712fd1b6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3873,3 +3873,4 @@ Video Disk Recorder Revision History
   reset has been triggered.
 - The CAM menu now automatically updates itself in case of a progress display (as
   used, for instance, when updating the firmware via satellite).
+- Now skipping some funny characters sent by some CAMs at the beginning of strings.
diff --git a/ci.c b/ci.c
index a0c63d65..2621932a 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.29 2005/10/02 12:51:42 kls Exp $
+ * $Id: ci.c 1.30 2005/10/02 13:10:28 kls Exp $
  */
 
 #include "ci.h"
@@ -92,6 +92,12 @@ static char *CopyString(int Length, const uint8_t *Data)
 ///< Copies the string at Data.
 ///< \return Returns a pointer to a newly allocated string.
 {
+  // Some CAMs send funny characters at the beginning of strings.
+  // Let's just skip them:
+  while (Length > 0 && (*Data == 0x05 || *Data == 0x96 || *Data == 0x97)) {
+        Length--;
+        Data++;
+        }
   char *s = MALLOC(char, Length + 1);
   strncpy(s, (char *)Data, Length);
   s[Length] = 0;