diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:07:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:15:37 +0300 |
| commit | 267a3f4c9c00848f32c341595d2d831157a79bee (patch) | |
| tree | cdef15bb746e3a41b1813076f24035fcc8385c30 /libmpdemux | |
| parent | 5484215d044522bcd30516e458e421f403ca8e35 (diff) | |
| parent | 96fa9c4e249e9467f21e32191882e511e762fb1f (diff) | |
| download | mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.bz2 mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.xz | |
Merge svn changes up to r26680
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_asf.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demux_ty_osd.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 40614f3745..7d5a164886 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -3,6 +3,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <assert.h> #include "config.h" #include "mp_msg.h" @@ -501,6 +502,7 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ p++; //printf(" group part: %d bytes\n",len2); if(len2 > len - 1) break; // Not enough data + assert(len2 > 0 && len2 <= asf->packetsize); demux_asf_read_packet(demux,p,len2,streamno,seq,x,duration,-1,keyframe); p+=len2; len-=len2+1; @@ -513,8 +515,10 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ default: // NO GROUPING: //printf("fragment offset: %d \n",sh->x); - if (!asf->asf_is_dvr_ms || asf->found_first_key_frame) + if (!asf->asf_is_dvr_ms || asf->found_first_key_frame) { + assert(len > 0 && len <= asf->packetsize); demux_asf_read_packet(demux,p,len,streamno,seq,time2,duration,x,keyframe); + } p+=len; break; } diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index 5b484999d6..db9911c865 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -1,5 +1,5 @@ // Most of this was written by Mike Baker <mbm@linux.com> -// and released under the GPL2 License. +// and released under the GPL v2+ license. // // Modifications and SEVERE cleanup of the code was done by // Christopher Wingert |