wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 957847 - Fix VTTCue crash at TextTrackCue::AddCue. r=rillian

Browse Source
This commit is contained in:
Rick Eyre 2014-01-15 11:30:58 -05:00
parent 2de6dd87ff
commit acf78892f7
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/media/TextTrack.cpp
View File

@ -93,7 +93,9 @@ void
TextTrack::AddCue(TextTrackCue& aCue)
{
mCueList->AddCue(aCue);
mMediaElement->AddCue(aCue);
if (mMediaElement) {
mMediaElement->AddCue(aCue);
}
SetDirty();
}

1
content/media/test/mochitest.ini
View File

@ -196,6 +196,7 @@ support-files =
[test_bug895305.html]
[test_bug895091.html]
[test_bug919265.html]
[test_bug957847.html]
[test_can_play_type.html]
[test_can_play_type_mpeg.html]
[test_closing_connections.html]

32
content/media/test/test_bug957847.html Normal file
View File

@ -0,0 +1,32 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=957847
-->
<head>
<meta charset='utf-8'>
<title>Regression test for bug 957847 - Crash on TextTrack::AddCue </title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
function() {
var trackElement = document.createElement('track');
trackElement.track.addCue(new VTTCue(0, 1, "A"));
// We need to assert something for Mochitest to be happy.
ok(true);
SimpleTest.finish();
}
);
</script>
</pre>
</body>
</html>