OSDN Git Service

add epgdump.
[rec10/rec10-git.git] / epgdump / epgdump_segfault_fix_patch(last).txt
1 diff -Nur epgdumpr2_orig/ts.c epgdumpr2/ts.c
2 --- epgdumpr2_orig/ts.c 2009-03-15 21:35:57.000000000 +0900
3 +++ epgdumpr2/ts.c      2009-07-19 18:38:17.000000000 +0900
4 @@ -202,6 +202,11 @@
5                         pk.payloadlen -= 1;
6                 }
7                 memset(pk.payload, 0xFF, sizeof(pk.payload));
8 +#if 1  /* 07/07/2009 add: */
9 +               if( pk.payloadlen > sizeof(pk.payload) ){
10 +                       continue;
11 +               }
12 +#endif
13                 memcpy(pk.payload, payptr, pk.payloadlen);
14      
15                 /*
16 @@ -307,6 +312,14 @@
17  
18  int checkcrc(SECcache *secs) {
19  
20 +#if 1  /* 07/07/2009 add: °Û¾ï¾õÂÖ²óÈò¤Î¤¿¤á */
21 +       /* ¥»¥¯¥·¥ç¥óºÇÂçŤòĶ¤¨¤ë¤³¤È¤Ê¤É¤¢¤êÆÀ¤Ê¤¤¤Ï¤º¤À¤¬... */
22 +       if( secs->seclen > MAXSECLEN ){
23 +               /* ¤è¤¯Ê¬¤«¤é¤ó¤Î¤ÇÇË´þ¤·¤Æ¤ä¤ë */
24 +               return 0;
25 +       }
26 +#endif
27 +
28         /* ¥»¥¯¥·¥ç¥ó¤Î½ª¤ê¤ËÃÖ¤«¤ì¤ë4¥Ð¥¤¥È¤ÎCRC32¤Ï¡¢
29            CRC·×»»¤Î·ë²Ì0¤Ë¤Ê¤ë¤è¤¦¤ËÀßÄꤵ¤ì¤ë¡£
30            Ãͤ¬È¯À¸¤·¤¿¾ì¹ç¤Ï¡¢¥¨¥é¡¼¤Ê¤Î¤ÇÂоݳ°¤Ë¤¹¤ë */