From: leslie <unknown>
Date: Sat, 1 Aug 2009 04:07:09 +0000 (+0800)
Subject: fix saving CA descr to ecm cache
X-Git-Tag: upstream/620~238
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=b9942df126ad09b752904c369074827fc199e6cd;p=sasc-ng.git

fix saving CA descr to ecm cache
---

diff --git a/cam.c b/cam.c
index 5907de2..5561e0e 100644
--- a/cam.c
+++ b/cam.c
@@ -598,7 +598,7 @@ bool cEcmData::Parse(const char *buf)
   char Name[64];
   int nu=0, num;
   Name[0]=0;
-  if(sscanf(buf,"%d:%x:%x:%63[^:]:%x/%x:%x:%x/%x:%d/%d%n",&prgId,&source,&transponder,Name,&caId,&emmCaId,&provId,&ecm_pid,&ecm_table,&nu,&dataIdx,&num)>=9) {
+  if(sscanf(buf,"%d:%x:%x:%63[^:]:%x/%x:%x:%x/%x:%d/%d%n",&prgId,&source,&transponder,Name,&caId,&emmCaId,&provId,&ecm_pid,&ecm_table,&nu,&dataIdx,&num)>=11) {
     SetName(Name);
     const char *line=buf+num;
     if(nu>0 && *line++==':') {
@@ -616,7 +616,8 @@ cString cEcmData::ToString(bool hide)
   char *str;
   if(caDescr) {
     str=AUTOARRAY(char,caDescrLen*2+16);
-    sprintf(str,":%d/%d:%s",caDescrLen,dataIdx,HexStr(str,caDescr,caDescrLen));
+    int q=sprintf(str,":%d/%d:",caDescrLen,dataIdx);
+    HexStr(str+q,caDescr,caDescrLen);
     }
   else {
     str=AUTOARRAY(char,4);