diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-10-27 12:15:40 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-10-27 12:15:40 +0000 |
| commit | 6a633d9ec13ba99132ebd179aa166d73d1bb8cca (patch) | |
| tree | a7b17fdc18d66868fe509039240e64dbac337f6a /games-util | |
| parent | Initial import (diff) | |
| download | gentoo-2-6a633d9ec13ba99132ebd179aa166d73d1bb8cca.tar.gz gentoo-2-6a633d9ec13ba99132ebd179aa166d73d1bb8cca.tar.bz2 gentoo-2-6a633d9ec13ba99132ebd179aa166d73d1bb8cca.zip | |
Fix overflow. Bug #340829
(Portage version: 2.1.9.22/cvs/Linux i686)
Diffstat (limited to 'games-util')
| -rw-r--r-- | games-util/deutex/ChangeLog | 6 | ||||
| -rw-r--r-- | games-util/deutex/deutex-4.4.0.ebuild | 6 | ||||
| -rw-r--r-- | games-util/deutex/files/deutex-4.4.0-ovflfix.patch | 11 |
3 files changed, 20 insertions, 3 deletions
diff --git a/games-util/deutex/ChangeLog b/games-util/deutex/ChangeLog index e185af86a4fb..54c642cb2014 100644 --- a/games-util/deutex/ChangeLog +++ b/games-util/deutex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-util/deutex # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/ChangeLog,v 1.6 2010/10/15 12:37:22 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/ChangeLog,v 1.7 2010/10/27 12:15:40 tupone Exp $ + + 27 Oct 2010; Tupone Alfredo <tupone@gentoo.org> deutex-4.4.0.ebuild, + +files/deutex-4.4.0-ovflfix.patch: + Fix overflow. Bug #340829 by flameeyes@gentoo.org 15 Oct 2010; Brent Baude <ranger@gentoo.org> deutex-4.4.0.ebuild: stable ppc, bug 315049 diff --git a/games-util/deutex/deutex-4.4.0.ebuild b/games-util/deutex/deutex-4.4.0.ebuild index 8c34b45ebd6e..49b1766d5e89 100644 --- a/games-util/deutex/deutex-4.4.0.ebuild +++ b/games-util/deutex/deutex-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/deutex-4.4.0.ebuild,v 1.6 2010/10/15 12:37:22 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/deutex-4.4.0.ebuild,v 1.7 2010/10/27 12:15:40 tupone Exp $ EAPI=2 inherit games @@ -14,9 +14,11 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" +RDEPEND="" DEPEND="" -PATCHES=( "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-64bit.patch ) +PATCHES=( "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-64bit.patch + "${FILESDIR}"/${P}-ovflfix.patch ) src_install() { dobin deusf deutex || die diff --git a/games-util/deutex/files/deutex-4.4.0-ovflfix.patch b/games-util/deutex/files/deutex-4.4.0-ovflfix.patch new file mode 100644 index 000000000000..32a7dce0d97c --- /dev/null +++ b/games-util/deutex/files/deutex-4.4.0-ovflfix.patch @@ -0,0 +1,11 @@ +--- src/sound.c.old 2010-10-27 12:32:28.000000000 +0200 ++++ src/sound.c 2010-10-27 12:32:52.000000000 +0200 +@@ -309,7 +309,7 @@ + if(fread(&headv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read header"); + if(strncmp(VocId,headv.ident,VOCIDLEN)!=0) ProgError("VOC: bad header"); + if(fseek(fp,headv.block1,SEEK_SET)) ProgError("VOC: bad header"); +- if(fread(&blockv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read block"); ++ if(fread(&blockv,sizeof(struct VOCBLOCK1),1,fp)!=1) ProgError("VOC: can't read block"); + if(blockv.type!=1) ProgError("VOC: first block is not sound"); + datasize= ((blockv.sizeU)<<16)&0xFF0000L; + datasize+=((blockv.sizeM)<<8)&0xFF00L; |