thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: Parser crash when adding an XML layout with an unhandled type.

Browse source 
svn-id: r34801
This commit is contained in:
Vicent Marti 2008-10-14 17:29:48 +00:00
parent b3625cae2f
commit 820a45d851
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/ThemeEval.cpp
View file

@ -151,6 +151,8 @@ void ThemeEval::addLayout(ThemeLayout::LayoutType type, int spacing, bool center
layout = new ThemeLayoutVertical(_curLayout.top(), spacing, center); layout = new ThemeLayoutVertical(_curLayout.top(), spacing, center);
else if (type == ThemeLayout::kLayoutHorizontal) else if (type == ThemeLayout::kLayoutHorizontal)
layout = new ThemeLayoutHorizontal(_curLayout.top(), spacing, center); layout = new ThemeLayoutHorizontal(_curLayout.top(), spacing, center);
assert(layout);
layout->setPadding( layout->setPadding(
getVar("Globals.Padding.Left", 0), getVar("Globals.Padding.Left", 0),

5
gui/ThemeParser.cpp
View file

@ -605,7 +605,10 @@ bool ThemeParser::parserCallback_layout(ParserNode *node) {
else if (node->values["type"] == "horizontal") else if (node->values["type"] == "horizontal")
_theme->getEvaluator()->addLayout(GUI::ThemeLayout::kLayoutHorizontal, spacing, node->values["center"] == "true"); _theme->getEvaluator()->addLayout(GUI::ThemeLayout::kLayoutHorizontal, spacing, node->values["center"] == "true");
else
return parserError("Invalid layout type. Only 'horizontal' and 'vertical' layouts allowed.");
if (node->values.contains("padding")) { if (node->values.contains("padding")) {
int paddingL, paddingR, paddingT, paddingB; int paddingL, paddingR, paddingT, paddingB;