While comparing content/media/video and content/html/content/src/nsHTMLMediaElement.cpp between trunk and 1.9.1 to make sure the code has not diverged unexpectedly, I noticed what looks like a mismerge: @@ -1331,11 +1331,11 @@ aMonitor.Enter(); } while (mState != DECODER_STATE_SHUTDOWN && r == E_OGGPLAY_TIMEOUT); + HandleDecodeErrors(r); + if (mState == DECODER_STATE_SHUTDOWN) break; - HandleDecodeErrors(r); - FrameData* nextFrame = NextFrame(); if (!nextFrame) break; This could lead to bugs, because HandleDecodeError can set mState to SHUTDOWN if an error occurred. In the 1.9.1 variant of the code, this would happen too late, since we've already checked for mState == SHUTDOWN.
Created attachment 381441 [details] [diff] [review] patch v0 for 1.9.1 only (already on trunk) Sync 1.9.1 code to trunk. As this code is already on trunk, it is safe to take it on 1.9.1. Fixes an important error handling case.
Comment on attachment 381441 [details] [diff] [review] patch v0 for 1.9.1 only (already on trunk) trivial change to fix mismerge from trunk to branch
Attachment #381441 - Flags: approval1.9.1?
Flags: wanted1.9.1? → wanted1.9.1+
Attachment #381441 - Flags: approval1.9.1? → approval1.9.1+
Comment on attachment 381441 [details] [diff] [review] patch v0 for 1.9.1 only (already on trunk) a191=beltzner
Status: ASSIGNED → RESOLVED
Last Resolved: 9 years ago
OS: Mac OS X → All
Hardware: x86 → All
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.