gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[indexer] Prevent FeatureParams::m_geomType usage before initialization.

Browse source
This commit is contained in:
tatiana-yan 2020-05-28 17:52:29 +03:00 • committed by Maksim Andrianov
parent eff38b080b
commit 7cb7f158e1
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
indexer/feature_data.cpp
View file

@ -359,7 +359,7 @@ void FeatureParams::SetGeomTypePointEx()
feature::GeomType FeatureParams::GetGeomType() const
{
CHECK(IsValid(), ());
switch (m_geomType)
switch (*m_geomType)
{
case HeaderGeomType::Line: return GeomType::Line;
case HeaderGeomType::Area: return GeomType::Area;
@ -370,7 +370,7 @@ feature::GeomType FeatureParams::GetGeomType() const
HeaderGeomType FeatureParams::GetHeaderGeomType() const
{
CHECK(IsValid(), ());
return m_geomType;
return *m_geomType;
}
void FeatureParams::SetRwSubwayType(char const * cityName)
@ -477,7 +477,7 @@ uint32_t FeatureParams::FindType(uint32_t comp, uint8_t level) const
bool FeatureParams::IsValid() const
{
if (m_types.empty() || m_types.size() > kMaxTypesCount)
if (m_types.empty() || m_types.size() > kMaxTypesCount || !m_geomType)
return false;
return FeatureParamsBase::IsValid();

7
indexer/feature_data.hpp
View file

@ -3,16 +3,17 @@
#include "indexer/feature_decl.hpp"
#include "indexer/feature_meta.hpp"
#include "geometry/point2d.hpp"
#include "coding/reader.hpp"
#include "coding/string_utf8_multilang.hpp"
#include "coding/value_opt_string.hpp"
#include "geometry/point2d.hpp"
#include <algorithm>
#include <array>
#include <cstdint>
#include <iterator>
#include <optional>
#include <string>
#include <utility>
#include <vector>
@ -288,7 +289,7 @@ private:
static uint32_t GetIndexForType(uint32_t t);
static uint32_t GetTypeForIndex(uint32_t i);
feature::HeaderGeomType m_geomType = feature::HeaderGeomType::Point;
std::optional<feature::HeaderGeomType> m_geomType;
};
class FeatureBuilderParams : public FeatureParams