Attachment 470698 Details for Bug 584615

[patch] Fix for intermittent infinite loop

infinite_loop.patch (text/plain), 1.10 KB, created by cajbir (:cajbir)

(hide)

Description:

Filename:

MIME Type:

Creator: cajbir (:cajbir)

Size: 1.10 KB

patch

obsolete

>diff --git a/content/media/ogg/nsOggReader.cpp b/content/media/ogg/nsOggReader.cpp
>index b2318ec..cf4680f 100644
>--- a/content/media/ogg/nsOggReader.cpp
>+++ b/content/media/ogg/nsOggReader.cpp
>@@ -289,8 +289,6 @@ nsresult nsOggReader::ReadMetadata()
>       gfxIntSize sz(mTheoraState->mInfo.pic_width,
>                     mTheoraState->mInfo.pic_height);
>       mDecoder->SetVideoData(sz, mTheoraState->mPixelAspectRatio, nsnull);
>-    } else {
>-      mTheoraState = nsnull;
>     }
>   }
>   if (mVorbisState) {
>@@ -1614,6 +1612,16 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
>         startTime = codecState->Time(granulepos) - aStartTime;
>         NS_ASSERTION(startTime > 0, "Must have positive start time");
>       }
>+      else if(codecState) {
>+        // Page is for an inactive stream, skip it.
>+        startOffset += page.header_len + page.body_len;
>+        continue;
>+      }
>+      else {
>+        // Page is for a stream we don't know about (Possibly a chained
>+        // ogg), return an error.
>+        return PAGE_SYNC_ERROR;
>+      }
>     }
> 
>     if (startTime != -1) {

Flags:

cpearce: review+

Actions: View | Diff | Review

Attachments on bug 584615: 463425 | 463426 | 463428 | 464304 | 464313 | 466922 | 468935 | 469714 | 470640 | 470693 | 470698 | 470713 | 471360 | 472321 | 473911 | 474858