Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #20163 - Manishearth:rowspan-crash, r=mbrubeck

Browse source 
Don't panic on cells with both a rowspan and colspan in include_sizes_from_previous_rows

fixes #20162

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20163)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-03-01 20:36:50 -05:00 • committed by GitHub
commit e446897cf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout/table_row.rs
View file

@ -123,7 +123,16 @@ impl TableRowFlow {
if *span == 1 { if *span == 1 {
break; break;
} }
let incoming = incoming_rowspan_data[*col]; let incoming = if let Some(incoming) = incoming_rowspan_data.get(*col) {
*incoming
} else {
// This happens when we have a cell with both rowspan and colspan
// incoming_rowspan_data only records the data for the first column,
// but that's ok because we only need to account for each spanning cell
// once. So we skip ahead.
*col += 1;
continue;
};
*max_block_size = max(*max_block_size, incoming); *max_block_size = max(*max_block_size, incoming);
*col += 1; *col += 1;
} }

10
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -39144,6 +39144,12 @@
{} {}
] ]
], ],
"mozilla/table_rowspan_colspan_crashtest.html": [
[
"/_mozilla/mozilla/table_rowspan_colspan_crashtest.html",
{}
]
],
"mozilla/textcontent.html": [ "mozilla/textcontent.html": [
[ [
"/_mozilla/mozilla/textcontent.html", "/_mozilla/mozilla/textcontent.html",
@ -70765,6 +70771,10 @@
"f43703402d539a05a55990cd2a03c50eabea122b", "f43703402d539a05a55990cd2a03c50eabea122b",
"support" "support"
], ],
"mozilla/table_rowspan_colspan_crashtest.html": [
"6890b7ec8b29dd5fb02c8e93035728f2b5bf8668",
"testharness"
],
"mozilla/table_valign_bottom.html": [ "mozilla/table_valign_bottom.html": [
"43814fb9c385f2501ff88673acf4b58079670015", "43814fb9c385f2501ff88673acf4b58079670015",
"reftest" "reftest"

22
tests/wpt/mozilla/tests/mozilla/table_rowspan_colspan_crashtest.html Normal file
View file

@ -0,0 +1,22 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
var load_test = async_test("Doesn't crash");
</script>
</head>
<body onload="load_test.done()">
<!-- Shouldn't crash (#20162) -->
<table border>
<tr><td>a</td><td>b</td><td>c</td><td>d</td></tr>
<tr><td rowspan=2>a</td><td>b</td><td colspan=2 rowspan=2>cd</td> </tr>
<tr> <td>b</td></tr>
<tr><td>a</td><td>b</td><td>c</td><td>d</td></tr>
</table>
</body>
</html>