sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

load_map: avoid segfault when ShieldSymbolizer has invalid placements

Browse source
This commit is contained in:
Mickey Rose 2017-02-22 03:21:48 +01:00
parent 4b17a417dc
commit 5464ae9cdf
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/load_map.cpp
View file

@ -1155,10 +1155,14 @@ void map_parser::parse_shield_symbolizer(rule & rule, xml_node const& node)
if (placement_type)
{
placements = placements::registry::instance().from_xml(*placement_type, node, fontsets_, true);
} else {
placements = std::make_shared<text_placements_dummy>();
if (!placements)
return;
}
else
{
placements = std::make_shared<text_placements_dummy>();
placements->defaults.from_xml(node, fontsets_, true);
}
placements->defaults.from_xml(node, fontsets_, true);
if (strict_ &&
!placements->defaults.format_defaults.fontset)
{