View | Details | Raw Unified | Return to bug 64775
Collapse All | Expand All

(-)debian/mpg123/common.c (-3 / +6 lines)
Lines 343-351 Link Here
343
      fr->mpeg25 = 1;
343
      fr->mpeg25 = 1;
344
    }
344
    }
345
    
345
    
346
    if (!param.tryresync || !oldhead) {
346
    if (!param.tryresync || !oldhead ||
347
          /* If "tryresync" is true, assume that certain
347
        (((oldhead>>19)&0x3) ^ ((newhead>>19)&0x3))) {
348
             parameters do not change within the stream! */
348
          /* If "tryresync" is false, assume that certain
349
             parameters do not change within the stream!
350
	     Force an update if lsf or mpeg25 settings
351
	     have changed. */
349
      fr->lay = 4-((newhead>>17)&3);
352
      fr->lay = 4-((newhead>>17)&3);
350
      if( ((newhead>>10)&0x3) == 0x3) {
353
      if( ((newhead>>10)&0x3) == 0x3) {
351
        fprintf(stderr,"Stream error\n");
354
        fprintf(stderr,"Stream error\n");
(-)debian/mpg123/layer2.c:1.2 (-1 / +1 lines)
Lines 240-246 Link Here
240
       { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 };
240
       { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 };
241
  static int sblims[5] = { 27 , 30 , 8, 12 , 30 };
241
  static int sblims[5] = { 27 , 30 , 8, 12 , 30 };
242
242
243
  if(fr->lsf)
243
  if(fr->sampling_frequency >= 3) /* Or equivalent: (fr->lsf == 1) */
244
    table = 4;
244
    table = 4;
245
  else
245
  else
246
    table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index];
246
    table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index];
(-)debian/mpg123/debian/changelog:1.35 (+7 lines)
Lines 1-3 Link Here
1
mpg123 (0.59r-18) unstable; urgency=high
2
3
  * common.c, layer2.c: Fix insufficient validation of MPEG header
4
    values, discovered by Yuri D'Elia (CAN-2004-0991).
5
6
 -- Daniel Kobras <kobras@debian.org>  Sat,  1 Jan 2005 20:18:25 +0100
7
1
mpg123 (0.59r-17) unstable; urgency=high
8
mpg123 (0.59r-17) unstable; urgency=high
2
9
3
  * httpget.c: Fix heap overflow in http authentication handler
10
  * httpget.c: Fix heap overflow in http authentication handler

Return to bug 64775