[SCM] libav/experimental: electronicarts: prevent endless loop opportunity in process_audio_header_elements() Fixes issue2529.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1c4ac0353021b1e243486cc6752cc9258d6de1a7
Author: Peter Ross <pross at xvid.org>
Date:   Tue Jan 11 02:25:12 2011 +0000

    electronicarts: prevent endless loop opportunity in process_audio_header_elements()
    Fixes issue2529.
    
    Originally committed as revision 26307 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index 27cd4a6..b796ede 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -109,7 +109,7 @@ static int process_audio_header_elements(AVFormatContext *s)
     ea->sample_rate = -1;
     ea->num_channels = 1;
 
-    while (inHeader) {
+    while (!url_feof(pb) && inHeader) {
         int inSubheader;
         uint8_t byte;
         byte = get_byte(pb);
@@ -118,7 +118,7 @@ static int process_audio_header_elements(AVFormatContext *s)
         case 0xFD:
             av_log (s, AV_LOG_DEBUG, "entered audio subheader\n");
             inSubheader = 1;
-            while (inSubheader) {
+            while (!url_feof(pb) && inSubheader) {
                 uint8_t subbyte;
                 subbyte = get_byte(pb);
 

-- 
Libav/FFmpeg packaging