head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.28
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.26
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.24
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.22
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.20
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.18
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.16
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.14
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.12
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.10
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.8
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.6
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.4
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.2
	pkgsrc-2007Q1-base:1.3;
locks; strict;
comment	@# @;


1.3
date	2007.02.07.20.04.00;	author drochner;	state dead;
branches;
next	1.2;

1.2
date	2007.01.10.17.18.37;	author drochner;	state Exp;
branches;
next	1.1;

1.1
date	2007.01.09.14.46.31;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.3
log
@update to 1.1.4
changes:
This release contains improvements and important bugfixes.
Some issues that have really "bugged" us for quite some
time (like NTSC DVDs audio sync, broken since 1.1.2, and
H.264 crashes) are finally fixed.
Some of the new features include True Audio and WavPack
support.
bugfixes, cleanup etc

pkgsrc notes:
-new True Audio / WavPack support is not enabled yet
-cleanup of bl3.mk: no need to propagate internals
-removed dependency on libflac -- there is support to play flac files
 internally
-removed build of plugins for more exotic video outputs (SDL, ImageMagick,
 GL, aalib), this might be built in extra pkgs (like esound and arts
 already do)
@
text
@$NetBSD: patch-ed,v 1.2 2007/01/10 17:18:37 drochner Exp $

--- src/input/libreal/asmrp.c.orig	2006-11-29 20:43:01.000000000 +0100
+++ src/input/libreal/asmrp.c
@@@@ -418,8 +418,8 @@@@ static int asmrp_operand (asmrp_t *p) {
     i = asmrp_find_id (p, p->str);
     if (i<0) {
       lprintf ("error: unknown identifier %s\n", p->str);
-    }
-    ret = p->sym_tab[i].v;
+    } else
+      ret = p->sym_tab[i].v;
 
     asmrp_get_sym (p);
     break;
@


1.2
log
@remove a part of the previous patch because the underlying problem
was already fixed in the xine release
(too bad that xine and mplayer are going to diverge here)
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@in local copy of libdvdnav:
-avoid file descriptor leak
-advance buffer pointer correctly on short reads
from an unnamed contributor

add limit check to real parser (CVE-2006-6172)
from mplayer svn

bump PKGREVISION
@
text
@d5 8
a12 5
@@@@ -37,6 +37,7 @@@@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "asmrp.h"
d14 2
a15 15
 #define LOG_MODULE "asmrp"
 #define LOG_VERBOSE
@@@@ -618,8 +619,10 @@@@ static int asmrp_eval (asmrp_t *p, int *
     if (asmrp_rule (p)) {
       lprintf ("rule #%d is true\n", rule_num);
 
-      matches[num_matches] = rule_num;
-      num_matches++;
+      if(num_matches < MAX_RULEMATCHES - 1)
+	matches[num_matches++] = rule_num;
+      else
+	printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num);
     }
 
     rule_num++;
@