[FFmpeg-cvslog] r22207 - trunk/libavformat/bink.c

[pross]

Author: pross
Date: Thu Mar  4 14:26:01 2010
New Revision: 22207

Log:
Guard against invalid memory read

Modified:
   trunk/libavformat/bink.c

Modified: trunk/libavformat/bink.c
==============================================================================
--- trunk/libavformat/bink.c	Thu Mar  4 13:34:15 2010	(r22206)
+++ trunk/libavformat/bink.c	Thu Mar  4 14:26:01 2010	(r22207)
@@ -210,7 +210,7 @@ static int read_packet(AVFormatContext *
         }
         bink->remain_packet_size -= 4 + audio_size;
         bink->current_track++;
-        if (audio_size > 0) {
+        if (audio_size >= 4) {
             /* get one audio packet per track */
             if ((ret = av_get_packet(pb, pkt, audio_size))
                                            != audio_size)
@@ -223,6 +223,8 @@ static int read_packet(AVFormatContext *
             bink->audio_pts[bink->current_track -1] +=
                 AV_RL32(pkt->data) / (2 * s->streams[bink->current_track]->codec->channels);
             return 0;
+        } else {
+            url_fseek(pb, audio_size, SEEK_CUR);
         }
     }