From bbb018bd4b881edf0c54f60ba829dddd6fbe9dfeb3e00ac9572470e785c095fa Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Thu, 22 Apr 2010 13:02:46 +0000
Subject: [PATCH] update fix

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmikmod?expand=0&rev=8
---
 libmikmod-3.1.12-CVE-2009-3995,3996.diff | 30 ++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/libmikmod-3.1.12-CVE-2009-3995,3996.diff b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
index 1d2b7ad..57e90a7 100644
--- a/libmikmod-3.1.12-CVE-2009-3995,3996.diff
+++ b/libmikmod-3.1.12-CVE-2009-3995,3996.diff
@@ -2,18 +2,24 @@ Index: loaders/load_it.c
 ===================================================================
 --- loaders/load_it.c.orig
 +++ loaders/load_it.c
-@@ -862,6 +862,11 @@ BOOL IT_Load(BOOL curious)
- #endif
- 
- 				IT_ProcessEnvelope(vol);
-+			
-+				// Secunia SA37775
-+				if (ih.volpts>= ENVPOINTS)
-+					ih.volpts = ENVPOINTS-1;
-+				
- 				for(u=0;u<ih.volpts;u++)
- 					d->volenv[u].val=(ih.volnode[u]<<2);
- 
+@@ -747,6 +747,8 @@ BOOL IT_Load(BOOL curious)
+ 				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; \
+ 				for(lp=0;lp<ITENVCNT;lp++) {							\
+ 					ih. name##node[lp]=_mm_read_##type (modreader);		\
+ 					ih. name##tick[lp]=_mm_read_I_UWORD(modreader);		\
+@@ -760,6 +762,8 @@ BOOL IT_Load(BOOL curious)
+ 				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; \
+ 				for(lp=0;lp<ITENVCNT;lp++) {							\
+ 					ih. name/**/node[lp]=_mm_read_/**/type (modreader);	\
+ 					ih. name/**/tick[lp]=_mm_read_I_UWORD(modreader);	\
 Index: loaders/load_ult.c
 ===================================================================
 --- loaders/load_ult.c.orig