Accepting request 38511 from multimedia:libs

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

OBS-URL: https://build.opensuse.org/request/show/38511
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmikmod?expand=0&rev=15
This commit is contained in:
OBS User autobuild 2010-04-22 23:43:44 +00:00 committed by Git OBS Bridge
commit 5d91c969e5
3 changed files with 24 additions and 13 deletions

View File

@ -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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 23 01:29:56 CEST 2010 - prusnak@suse.cz
- fix CVE-2009-3995,3996
-------------------------------------------------------------------
Wed Apr 21 15:03:19 CEST 2010 - prusnak@suse.cz

View File

@ -25,7 +25,7 @@ License: LGPLv2.1+
Group: System/Libraries
Summary: MikMod Sound Library
Version: 3.1.12
Release: 2
Release: 3
# bug437293
%ifarch ppc64
Obsoletes: libmikmod-64bit