fix breakage that was introduced with the recent FLAC security fix

which breaks some FLAC files.

from the Xine-lib source repo via brad@

ok naddy@
This commit is contained in:
jakemsr 2008-02-24 20:36:15 +00:00
parent 54fdcd171a
commit b62fe228b5
2 changed files with 14 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2008/02/11 01:17:33 jakemsr Exp $
# $OpenBSD: Makefile,v 1.28 2008/02/24 20:36:15 jakemsr Exp $
COMMENT-main= multimedia decoding library
COMMENT-esd= esound audio output module for xine-lib
@ -7,7 +7,7 @@ COMMENT-arts= artsd audio output module for xine-lib
V= 1.1.10
VER= ${V}.1
DISTNAME= xine-lib-${VER}
PKGNAME-main= ${DISTNAME}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-esd= xine-lib-esd-${VER}
PKGNAME-arts= xine-lib-arts-${VER}
EXTRACT_SUFX= .tar.bz2

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_demuxers_demux_flac_c,v 1.1 2008/02/24 20:36:15 jakemsr Exp $
--- src/demuxers/demux_flac.c.orig Sat Feb 23 23:14:59 2008
+++ src/demuxers/demux_flac.c Sat Feb 23 23:16:31 2008
@@ -202,7 +202,7 @@ static int open_flac_file(demux_flac_t *flac) {
length = _X_LE_32(ptr);
ptr += 4 + length;
- if (length >= block_length - 8)
+ if (length > block_length - 8)
return 0; /* bad length or too little left in the buffer */
user_comment_list_length = _X_LE_32(ptr);