diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2008-02-25 08:53:04 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2008-02-25 08:53:04 +0000 |
| commit | 73c02364a8c8a75b2f285b7580f21d1ac6628819 (patch) | |
| tree | a9dd46f4037fd7196e2ee692d07fd9a280fea185 /render | |
| parent | 369344518a97b2ee1c621d5d672de6a566fbfdf9 (diff) | |
| download | netsurf-73c02364a8c8a75b2f285b7580f21d1ac6628819.tar.gz netsurf-73c02364a8c8a75b2f285b7580f21d1ac6628819.tar.bz2 | |
Ignore spurious top-level framesets correctly (previously declared memory exhaustion, which is obviously wrong)
svn path=/trunk/netsurf/; revision=3863
Diffstat (limited to 'render')
| -rw-r--r-- | render/box_construct.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/render/box_construct.c b/render/box_construct.c index 391999aa7..c806297cb 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -1652,7 +1652,11 @@ bool box_frameset(BOX_SPECIAL_PARAMS) if (content->data.html.frameset) { LOG(("Error: multiple framesets in document.")); - return false; + /* Don't convert children */ + if (convert_children) + *convert_children = false; + /* And ignore this spurious frameset */ + return true; } content->data.html.frameset = talloc_zero(content, struct content_html_frames); |