[FFmpeg-cvslog] mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
Tomas Härdin
git at videolan.org
Thu Dec 22 14:32:45 CET 2011
ffmpeg | branch: master | Tomas Härdin <tomas.hardin at codemill.se> | Wed Dec 21 12:00:04 2011 +0100| [cc1dda851b082826e652d698a9ca4738fc2a0ea5] | committer: Tomas Härdin
mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc1dda851b082826e652d698a9ca4738fc2a0ea5
---
libavformat/mxfdec.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 50dc3a8..47fa81d 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1745,7 +1745,7 @@ static void mxf_packet_timestamps(MXFContext *mxf, AVPacket *pkt)
return;
/* find mxf->current_edit_unit so that the next edit unit starts ahead of pkt->pos */
- for (;;) {
+ while (mxf->current_edit_unit >= 0) {
if (mxf_edit_unit_absolute_offset(mxf, t, mxf->current_edit_unit + 1, NULL, &next_ofs, 0) < 0)
break;
@@ -1763,7 +1763,7 @@ static void mxf_packet_timestamps(MXFContext *mxf, AVPacket *pkt)
mxf->current_edit_unit++;
}
- if (mxf->current_edit_unit >= t->nb_ptses)
+ if (mxf->current_edit_unit < 0 || mxf->current_edit_unit >= t->nb_ptses)
return;
pkt->dts = mxf->current_edit_unit + t->first_dts;
More information about the ffmpeg-cvslog
mailing list