From 052e93499aeda449e26ff22f4f4c61baf58f8d5386cb11241f6a550d402fe11e Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 27 Aug 2010 12:29:37 +0000
Subject: [PATCH] Accepting request 46212 from multimedia:libs

Copy from multimedia:libs/libmikmod based on submit request 46212 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/46212
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmikmod?expand=0&rev=18
---
 libmikmod-3.1.12-CVE-2009-3995,3996.diff | 8 ++++----
 libmikmod.changes                        | 5 +++++
 libmikmod.spec                           | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libmikmod-3.1.12-CVE-2009-3995,3996.diff b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
index 57e90a7..932896e 100644
--- a/libmikmod-3.1.12-CVE-2009-3995,3996.diff
+++ b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
@@ -6,8 +6,8 @@ Index: loaders/load_it.c
  				ih. name##end   =_mm_read_UBYTE(modreader);				\
  				ih. name##susbeg=_mm_read_UBYTE(modreader);				\
  				ih. name##susend=_mm_read_UBYTE(modreader);				\
-+				if (ih. name##pts>= ENVPOINTS) \
-+					ih. name##pts = ENVPOINTS-1; \
++				if (ih. name##pts>= ITENVCNT) \
++					ih. name##pts = ITENVCNT-1; \
  				for(lp=0;lp<ITENVCNT;lp++) {							\
  					ih. name##node[lp]=_mm_read_##type (modreader);		\
  					ih. name##tick[lp]=_mm_read_I_UWORD(modreader);		\
@@ -15,8 +15,8 @@ Index: loaders/load_it.c
  				ih. name/**/end   =_mm_read_UBYTE(modreader);			\
  				ih. name/**/susbeg=_mm_read_UBYTE(modreader);			\
  				ih. name/**/susend=_mm_read_UBYTE(modreader);			\
-+				if (ih. name/**/pts>= ENVPOINTS) \
-+					ih. name/**/pts = ENVPOINTS-1; \
++				if (ih. name/**/pts>= ITENVCNT) \
++					ih. name/**/pts = ITENVCNT-1; \
  				for(lp=0;lp<ITENVCNT;lp++) {							\
  					ih. name/**/node[lp]=_mm_read_/**/type (modreader);	\
  					ih. name/**/tick[lp]=_mm_read_I_UWORD(modreader);	\
diff --git a/libmikmod.changes b/libmikmod.changes
index a881433..c5989e0 100644
--- a/libmikmod.changes
+++ b/libmikmod.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 25 13:26:22 UTC 2010 - prusnak@opensuse.org
+
+- correct fix for CVE-2009-3995 [bnc#625547]
+
 -------------------------------------------------------------------
 Fri Apr 23 01:29:56 CEST 2010 - prusnak@suse.cz
 
diff --git a/libmikmod.spec b/libmikmod.spec
index 076672b..e7ab9dd 100644
--- a/libmikmod.spec
+++ b/libmikmod.spec
@@ -25,7 +25,7 @@ License:        LGPLv2.1+
 Group:          System/Libraries
 Summary:        MikMod Sound Library
 Version:        3.1.12
-Release:        3
+Release:        8
 # bug437293
 %ifarch ppc64
 Obsoletes:      libmikmod-64bit