Closed
Bug 486646
Opened 16 years ago
Closed 16 years ago
nsMediaChannelStream::OnStopRequest nulls out mChannel too early
Categories
(Core :: Audio/Video, defect)
Tracking
()
VERIFIED
FIXED
People
(Reporter: kinetik, Assigned: mayhemer)
References
Details
(Keywords: verified1.9.1)
Attachments
(1 file, 6 obsolete files)
(deleted),
patch
|
Details | Diff | Splinter Review |
This causes GetPrincipal() to return null after the load completes. This causes the two video canvas reftests to fail with a security error. The tests have been marked random for now, so they need to be reenabled when this bug is fixed.
Flags: blocking1.9.1?
Flags: blocking1.9.1? → blocking1.9.1+
Assignee | ||
Comment 2•16 years ago
|
||
Are STR from that bug reliable way to reproduce?
Reporter | ||
Comment 3•16 years ago
|
||
The steps from that bug can be simplified:
1. Visit http://tapper-ware.net/devel/js/JS.StereoVideo/index2.xhtml
2. Wait for the video to completely download
3. Click play
You should see the canvas below the video update as the video plays. Instead, due to this bug, the canvas won't update, and you will see security errors logged in the error console.
Comment 5•16 years ago
|
||
Note that nulling out the channel is probably correct (though not really necessary to avoid leaks). The real issue is not saving off the principal before doing that.
Does the channel start returning null from GetPrincipal?
Comment 7•16 years ago
|
||
No, if you have an nsIChannel, even one that's done getting data, you can get its principal via the security manager API.
So if this code did hold on to mChannel that would certainly fix the principal issue.
Assignee | ||
Comment 8•16 years ago
|
||
I have a patch for this. Soon will submit after I check there are no leaks/crashes.
Assignee: nobody → honzab.moz
Status: NEW → ASSIGNED
Assignee | ||
Comment 9•16 years ago
|
||
Hmm... when I run mochitest and open the URL in the mochitest profile (i.e. clear one) video is not streaming (there is no pre-load). In a completely new profile it works. Having trunk build few hours old from now. Is it intention, some setting for mochitest environment? user_pref("media.cache_size", 100)?
That setting is to provide better testing of the media cache. Video should still play correctly though, what exactly is the problem you're seeing?
Assignee | ||
Comment 11•16 years ago
|
||
(In reply to comment #10)
> That setting is to provide better testing of the media cache. Video should
> still play correctly though, what exactly is the problem you're seeing?
OK, just checked it's not caused by my patch. When I open the URL from comment 3, video first frame appears. Then, when I do this in a clean profile I can see the buffer indicator is growing as the whole video file is being downloaded, immediately after I open the URL. But, when I open the URL in mochitest profile, the video file is not being automatically downloaded; only after I press play button it starts to download and play with it.
In the mochitest profile, a small amount of data will be downloaded and then we'll pause because the media cache is full. Then when you press play we'll be able to discard some data and continue the download. This is intended behaviour when the cache size is small.
Assignee | ||
Comment 13•16 years ago
|
||
I'm saving mPrincipal in OnStartRequest(). I am not sure if you expect this method be called only on the main thread.
Attachment #373115 -
Flags: review?(roc)
Assignee | ||
Updated•16 years ago
|
Whiteboard: [has patch][needs review roc]
Comment 14•16 years ago
|
||
So what happens with the principal in the cached-data case, then?
Assignee | ||
Comment 15•16 years ago
|
||
(In reply to comment #14)
> So what happens with the principal in the cached-data case, then?
cache-data case means to read data from mCacheStream or when an underlying channel is loading from a cache, e.g. an http cache?
Comment 16•16 years ago
|
||
The former: the case where you're clearing mPrincipal and mChannel in this patch.
I'm confused ... where is he clearing mPrincipal and mChannel in this patch? The only place I see is in nsMediaFileStream::Close, which seems OK ... nsMediaFileStream is for file: URIs and has nothing to do with caching...
Comment on attachment 373115 [details] [diff] [review]
v1
This is fine as far as I'm concerned but I'd like Boris to sign off too
Attachment #373115 -
Flags: review?(roc)
Attachment #373115 -
Flags: review?(bzbarsky)
Attachment #373115 -
Flags: review+
Comment 19•16 years ago
|
||
Ah, ok. I was fooled by the NS_ERROR_PARSED_DATA_CACHED nsresult used there.
I'll look in more detail tomorrow, assuming I get through all of Blake's wrapper stuff...
Assignee | ||
Comment 20•16 years ago
|
||
(In reply to comment #16)
> The former: the case where you're clearing mPrincipal and mChannel in this
> patch.
Sorry for later answer. As I understand how the media channel works it opens an underlying channel (a request) and caches the content in mCacheStream, that is actually a buffer. When user wants to play the media a decoder is using data in the cache stream. When there are not any data in the buffer for a segment user wants to play media channel opens a new request and fills the buffer - the cache stream. During all this time there is still mPrincipal filled (from the moment we get OnStartRequest) and if not it is always attempted to get it from a channel if there is a channel (as before).
I didn't find another place where the channel is cleared (and where mPrincipal should be discarded) then in nsMediaFileStream::Close. I am not sure it's the best place but as I see the code it seems appropriate to clear it on that place.
Comment 21•16 years ago
|
||
So the point is that whenever we're doing Close() there that means we have a new channel we're using to load data?
Note that for this to work correctly for local files, the media code probably needs to be setting some owners on those channels; that should likely be a separate bug.
Comment 22•16 years ago
|
||
I guess a better question is... where is nsMediaFileStream::Close called from? And wouldn't it make more sense to clear mPrincipal when assigning a new non-null mChannel if that's why it's ok to clear it?
Assignee | ||
Comment 23•16 years ago
|
||
We are assigning a new channel in nsMediaChannelStream::CacheClientSeek. :Close is called when decoder is being shut down what happens during removal of the media element or page close, not sure when src of video element is changed by a script.
The patch is wrong. I'd say we should null mPrincipal in all Close method implementations. When element is somehow replaced or URL is replaced channel may for some time keep a wrong principal.
bz, what do think?
Comment 24•16 years ago
|
||
I have no idea. How does the Close() method relate to the ability to get data out of the video element.
Whenever one can get data out of the element, we need to be able to get the principal of that data. When the element has no data, it's fine to be returning null.
Close() is only called when we shut down the decoder. At that point we should not be painting video to the screen or the canvas anymore. So it's OK to null things out there and not return a principal. nsMediaChannelStream::CloseChannel() happens during CacheClientSeek, but we create a new channel there right away so setting the channel to null in CloseChannel shouldn't be a problem.
I think the main issue for this bug was just nulling out mChannel in OnStopRequest. If we just stop doing that, this bug should be fixed.
A deeper issue is that data in the cache might not all be associated with the same principal. We might read some data with one principal, seek and get redirected, then read data for some other principal. That's really a different bug; I'm not sure what the best way to handle it is. I suppose we should track all the principals of all the channels we've used and return their intersection or something like that.
Assignee | ||
Comment 26•16 years ago
|
||
A bit better patch. I clear mPrincipal in all Close() methods and when replacing a channel in CacheClientSeek().
Just for curiosity, leaving the channel in OnStopRequest fixes the bug too, and there are no leaks. Maybe do it that way?
Attachment #373115 -
Attachment is obsolete: true
Attachment #373709 -
Flags: review?(bzbarsky)
Attachment #373115 -
Flags: review?(bzbarsky)
Assignee | ||
Updated•16 years ago
|
Whiteboard: [has patch][needs review roc] → [has patch][needs review bz]
Comment 27•16 years ago
|
||
That sounds like what roc is proposing to me.
Assignee | ||
Comment 28•16 years ago
|
||
OK, then this is the second variant. All content/media tests are passing with it and there are no leaks.
Attachment #373716 -
Flags: review?(bzbarsky)
Assignee | ||
Updated•16 years ago
|
Attachment #373716 -
Attachment is patch: true
Attachment #373716 -
Attachment mime type: application/octet-stream → text/plain
Comment 29•16 years ago
|
||
That last patch looks fine to me on its own, but someone very familiar with the video networking stuff should review it to make sure that nothing is depeding on mChannel being null.
Attachment #373716 -
Flags: review+
Assignee | ||
Comment 31•16 years ago
|
||
Comment on attachment 373709 [details] [diff] [review]
v2
Looks like this approach is dead now.
Attachment #373709 -
Attachment is obsolete: true
Attachment #373709 -
Flags: review?(bzbarsky)
Comment on attachment 373716 [details] [diff] [review]
v3 [Checkin comment 33]
actually, Boris said this was OK, so let's not delay getting this landed.
Attachment #373716 -
Flags: review?(bzbarsky) → review+
Whiteboard: [has patch][needs review bz] → [has patch][needs landing]
Assignee | ||
Comment 33•16 years ago
|
||
Comment on attachment 373716 [details] [diff] [review]
v3 [Checkin comment 33]
http://hg.mozilla.org/mozilla-central/rev/524233971e2c
Attachment #373716 -
Attachment description: v3 → v3 [Checkin comment 33]
Assignee | ||
Updated•16 years ago
|
Status: ASSIGNED → RESOLVED
Closed: 16 years ago
Resolution: --- → FIXED
Whiteboard: [has patch][needs landing] → [has patch][needs 191 landing]
Comment 34•16 years ago
|
||
To be clear, that patch is OK from the necko end and from the "getting a principal" end. I can't speak to its interaction with the other video stuff.
Also, this should have a test, no?
Flags: in-testsuite?
Assignee | ||
Comment 35•16 years ago
|
||
Attachment #374868 -
Flags: review?(roc)
Assignee | ||
Comment 36•16 years ago
|
||
May land on 1.9.1 after the test gets reviewed.
Assignee | ||
Updated•16 years ago
|
Whiteboard: [has patch][needs 191 landing] → [has patch][needs review roc][needs 191 landing]
Comment on attachment 374868 [details] [diff] [review]
test v1
+var currentMediaCache = prefs.getIntPref("media.cache_size");
+prefs.setIntPref("media.cache_size", 50*1024);
Just do <script src="use_large_cache.js"> like the other tests.
I think it would be best to do the drawing off the "load" event, not canplaythrough or timeupdate. It's quite likely that this test will pass on trunk if drawWindow fires while we're still downloading and holding the mChannel reference.
Whiteboard: [has patch][needs review roc][needs 191 landing] → [has patch][needs 191 landing]
Assignee | ||
Comment 38•16 years ago
|
||
Robert, rorry for such a long time to react, but I missed bug mail with your last comment...
Is there something different on 1.9.1 with the events? I'm using canplaythrough that is called when load of the data is complete (we are pass OnStopRequest, where the code change is). It perfectly works on trunk, is the behavior different on 1.9.1? Or you mean that canplaythrough can pass before we load all data?
Also, it seems the patch has already been landed on 1.9.1:
http://hg.mozilla.org/releases/mozilla-1.9.1/rev/cb68da3b406a
So, we are just about to push the test.
Keywords: fixed1.9.1
Whiteboard: [has patch][needs 191 landing] → [missing test]
canplaythrough can be called before the load of the data is complete. We'll call it as soon as we think we can play all the way through without stalling --- i.e., when we think we'll finish loading the data at about the same time as we finish playing.
Assignee | ||
Comment 40•16 years ago
|
||
I cannot reproduce the problem when I rollback the patch on trunk. Something has changed?
Yes, principals are now tracked through nsMediaCache. Your patch here is probably not needed anymore.
Assignee | ||
Comment 42•16 years ago
|
||
So, only thing left to do here is to have a test for 1.9.1.
Reporter | ||
Comment 43•16 years ago
|
||
A mochitest that paints the video to a canvas after the video has completely loaded.
According to the spec, it's only legal to paint the video to the canvas when readyState >= HAVE_CURRENT_DATA (i.e. when the current frame is available), and it's possible for the load event to fire before that predicate holds, so the test will run the paint off of the loadeddata event if that occurs.
I don't think it's possible for load to fire before loadeddata in our current code, because we deliberately suppress the load event until we fire loadedmetadata, and we always fire loadedmetadata and loadeddata at the same time. I can't see anything in the spec that requires the former, and I'm sure that the latter is not required either. Am I right? If so, should we be proposing this change/simplification to the HTML 5 WG?
Attachment #373716 -
Attachment is obsolete: true
Attachment #374868 -
Attachment is obsolete: true
Attachment #374879 -
Attachment is obsolete: true
Attachment #374868 -
Flags: review?(roc)
You mean, should we propose that the spec require "load" to fire after "loadeddata"?
I don't feel very strongly about it, but I suppose it would be a good idea.
Reporter | ||
Comment 45•16 years ago
|
||
That, or at least after loadedmetadata. That'd make a media load event consistent with an img load event (which fires when the image is "available", meaning the metadata is known), but that's the only argument I can come up with and it seems fairly week. Looking at the other places a load event can be fired in HTML5:
link, style: when resource is fetched
script: when script created (including parsing)
object: once completely loaded (not really clear on this one)
iframe: when contented loaded and in frame loads have fired
img, input button: when metadata available
document: once no longer delayed
...it seems like there's scope but no strong argument to delay it for media elements.
I've emailed the WHATWG list. I guess we won't need to take any action whatever the outcome is, but if we do I'll file a new bug.
Whiteboard: [missing test] → [missing test][needs landing]
Reporter | ||
Comment 46•16 years ago
|
||
Anne van Kesteren pointed out on WHATWG that the spec already requires the events to be ordered, so you will always see loadedmetadata, loadeddata, then load.
Attachment #379434 -
Attachment is obsolete: true
Reporter | ||
Comment 47•16 years ago
|
||
Temporarily marking reopened so this shows up on the radar for [needs landing] or checkin-needed searches, since the tree is restricted and I might forget about this before I can check it in.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Can we move the tests to a new bug and close this one? It's blocking1.9.1+ so reopening it will confuse drivers.
Reporter | ||
Comment 49•16 years ago
|
||
Good point. Sorry, that was dumb. Bug 495165.
Status: REOPENED → RESOLVED
Closed: 16 years ago → 16 years ago
Resolution: --- → FIXED
Comment 50•16 years ago
|
||
verified FIXED using STR from comment #3
Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.2a1pre) Gecko/20090528 Minefield/3.6a1pre ID:20090528112613
and
Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1pre) Gecko/20090602 Shiretoko/3.5pre ID:20090602031310
Status: RESOLVED → VERIFIED
Keywords: fixed1.9.1 → verified1.9.1
Comment 51•15 years ago
|
||
Bug 495165 added a mochitest for this, pushed in rev bd1d2c9c5799.
http://hg.mozilla.org/mozilla-central/rev/bd1d2c9c5799
Flags: in-testsuite? → in-testsuite+
Whiteboard: [missing test][needs landing]
You need to log in
before you can comment on or make changes to this bug.
Description
•