Changeset 10001
- Timestamp:
- 11/15/14 11:23:50 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-conf-mk.c
r9617 r10001 72 72 { 73 73 int32_t i, needed = 1, pos = 0; 74 for(i = 0; i < ttab->n ; i++)74 for(i = 0; i < ttab->n && i <= CS_MAXTUNTAB ; i++) 75 75 { 76 76 // ttab->bt_srvid[i] or 0000 for EMM-only tunnel … … 81 81 if(needed == 1 || !cs_malloc(&value, needed)) { return ""; } 82 82 char *saveptr = value; 83 for(i = 0; i < ttab->n ; i++)83 for(i = 0; i < ttab->n && i <= CS_MAXTUNTAB; i++) 84 84 { 85 85 if(i == 0) … … 163 163 { 164 164 needed = ftab->nfilts * 5; 165 for(i = 0; i < ftab->nfilts ; ++i)165 for(i = 0; i < ftab->nfilts && i < CS_MAXFILTERS; ++i) 166 166 { needed += ftab->filts[i].nprids * 7; } 167 167 } … … 171 171 char *saveptr = value; 172 172 char *dot = ""; 173 for(i = 0; i < ftab->nfilts ; ++i)173 for(i = 0; i < ftab->nfilts && i < CS_MAXFILTERS; ++i) 174 174 { 175 175 snprintf(value + pos, needed - (value - saveptr), "%s%04X", dot, ftab->filts[i].caid); … … 705 705 char *ptr = buf; 706 706 707 for(i = 0; i < tab->n ; i++)707 for(i = 0; i < tab->n && tab->n <= CS_MAX_CAIDVALUETAB; i++) 708 708 { 709 709 if(tab->caid[i] < 0x0100) //Do not format 0D as 000D, its a shortcut for 0Dxx: … … 726 726 char *ptr = buf; 727 727 728 for(i = 0; i < tab->n ; i++)728 for(i = 0; i < tab->n && tab->n <= CS_MAXCAIDTAB ; i++) 729 729 { 730 730 if(i) { ptr += snprintf(ptr, size - (ptr - buf), ","); } … … 773 773 char *ptr = buf; 774 774 775 for(i = 0; i < tab->n ; i++)775 for(i = 0; i < tab->n && i <= CS_MAXCAIDTAB; i++) 776 776 { 777 777 if(i) { ptr += snprintf(ptr, size - (ptr - buf), ","); }
Note:
See TracChangeset
for help on using the changeset viewer.