From 18428b7f7cd94ef3ef3b9427a41d0efcbcfa0965 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Wed, 12 Jan 2005 11:52:38 +0000
Subject: another header valdation (CAN-2004-0991) ride on recent PKGREVISION
 bump

---
 audio/mpg123/distinfo         |  4 ++--
 audio/mpg123/patches/patch-ar | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'audio/mpg123')

diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index b1bc3c86d43..94fbdf5f87b 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2005/01/07 14:52:13 drochner Exp $
+$NetBSD: distinfo,v 1.21 2005/01/12 11:52:38 drochner Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
@@ -21,6 +21,6 @@ SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef
 SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304
 SHA1 (patch-ap) = b35e7f6739a8b4979412793c7b3f2f7f5a9f15a7
 SHA1 (patch-aq) = a993d815b6657b9a2241b2e3f0ba30d6c2861230
-SHA1 (patch-ar) = 6238d6f2ff3f3abf4fd47bc36edcf6696d76fea4
+SHA1 (patch-ar) = e81771bf72da97d898f9320fb6c529e5a1151050
 SHA1 (patch-as) = 8765b22c556cdc217f6270f3a5e70b40b36b9229
 SHA1 (patch-at) = 9a64a62f7d1d115e3d36dbb0f08762d4b0eb1e2b
diff --git a/audio/mpg123/patches/patch-ar b/audio/mpg123/patches/patch-ar
index 0e8d87d8d0a..4517d3bcae9 100644
--- a/audio/mpg123/patches/patch-ar
+++ b/audio/mpg123/patches/patch-ar
@@ -1,10 +1,17 @@
-$NetBSD: patch-ar,v 1.1 2004/09/07 22:14:09 salo Exp $
-
-CVE: CAN-2004-0805
+$NetBSD: patch-ar,v 1.2 2005/01/12 11:52:38 drochner Exp $
 
 --- layer2.c.orig	1999-02-10 13:13:06.000000000 +0100
-+++ layer2.c	2004-09-08 00:00:06.000000000 +0200
-@@ -265,6 +265,12 @@
++++ layer2.c
+@@ -240,7 +240,7 @@ static void II_select_table(struct frame
+        { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 };
+   static int sblims[5] = { 27 , 30 , 8, 12 , 30 };
+ 
+-  if(fr->lsf)
++  if(fr->sampling_frequency >= 3) /* Or equivalent: (fr->lsf == 1) */
+     table = 4;
+   else
+     table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index];
+@@ -265,6 +265,12 @@ int do_layer2(struct frame *fr,int outmo
    fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ?
       (fr->mode_ext<<2)+4 : fr->II_sblimit;
  
-- 
cgit v1.2.3