head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q1:1.1.0.4
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2009.06.12.16.25.34;	author ahoka;	state dead;
branches;
next	1.1;

1.1
date	2009.01.29.15.02.13;	author tron;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2009.01.29.15.02.13;	author rtr;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2009.02.01.03.50.57;	author rtr;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to nightly the snapshot as of 2009-06-11.
Also modularize a bit, so we can have a separate ffplay package.

Too many changes to list them.
@
text
@$NetBSD: patch-4xm,v 1.1 2009/01/29 15:02:13 tron Exp $

Patch for buffer overflow based on this change:
http://svn.ffmpeg.org/ffmpeg/trunk/libavformat/4xm.c?r1=16838&r2=16846

--- libavformat/4xm.c.orig	2009-01-29 14:33:19.000000000 +0000
+++ libavformat/4xm.c	2009-01-29 14:37:44.000000000 +0000
@@@@ -163,10 +163,12 @@@@
                 return AVERROR_INVALIDDATA;
             }
             current_track = AV_RL32(&header[i + 8]);
+            if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){
+                av_log(s, AV_LOG_ERROR, "current_track too large\n");
+                return -1;
+            }
             if (current_track + 1 > fourxm->track_count) {
                 fourxm->track_count = current_track + 1;
-                if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
-                    return -1;
                 fourxm->tracks = av_realloc(fourxm->tracks,
                     fourxm->track_count * sizeof(AudioTrack));
                 if (!fourxm->tracks) {
@


1.1
log
@Add fix for buffer overflow in 4xm movie format decoder based on a
patch from "ffmpeg" SVN.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-4xm was added on branch pkgsrc-2008Q4 on 2009-02-01 03:50:57 +0000
@
text
@d1 22
@


1.1.2.2
log
@pullup ticket #2672 - requested by tron
ffmpeg: fix buffer overflow

revisions pulled up:
pkgsrc/multimedia/ffmpeg/Makefile		1.47
pkgsrc/multimedia/ffmpeg/distinfo		1.22
pkgsrc/multimedia/ffmpeg/patches/patch-4xm	1.1

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Thu Jan 29 15:02:13 UTC 2009

   Modified Files:
           pkgsrc/multimedia/ffmpeg: Makefile distinfo
   Added Files:
           pkgsrc/multimedia/ffmpeg/patches: patch-4xm

   Log Message:
   Add fix for buffer overflow in 4xm movie format decoder based on a
   patch from "ffmpeg" SVN.
@
text
@a0 22
$NetBSD: patch-4xm,v 1.1 2009/01/29 15:02:13 tron Exp $

Patch for buffer overflow based on this change:
http://svn.ffmpeg.org/ffmpeg/trunk/libavformat/4xm.c?r1=16838&r2=16846

--- libavformat/4xm.c.orig	2009-01-29 14:33:19.000000000 +0000
+++ libavformat/4xm.c	2009-01-29 14:37:44.000000000 +0000
@@@@ -163,10 +163,12 @@@@
                 return AVERROR_INVALIDDATA;
             }
             current_track = AV_RL32(&header[i + 8]);
+            if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){
+                av_log(s, AV_LOG_ERROR, "current_track too large\n");
+                return -1;
+            }
             if (current_track + 1 > fourxm->track_count) {
                 fourxm->track_count = current_track + 1;
-                if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
-                    return -1;
                 fourxm->tracks = av_realloc(fourxm->tracks,
                     fourxm->track_count * sizeof(AudioTrack));
                 if (!fourxm->tracks) {
@