Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/map
diff options
context:
space:
mode:
authorSergey Magidovich <mgsergio@mapswithme.com>2016-07-06 16:41:27 +0300
committerSergey Magidovich <mgsergio@mapswithme.com>2016-07-07 12:49:22 +0300
commit354462bee81f267d807d8d4e2b9d9c4df5d43c4e (patch)
treead804b41191e69f83da5488dd96f544367eb03e2 /map
parentabad74b76c735eca873ee1384de40607993aec32 (diff)
Check return value of m_getOriginalFeatureFn().
Diffstat (limited to 'map')
-rw-r--r--map/framework.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/map/framework.cpp b/map/framework.cpp
index bce964d281..467e116b27 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -394,7 +394,8 @@ Framework::Framework()
{
unique_ptr<FeatureType> feature(new FeatureType());
Index::FeaturesLoaderGuard const guard(m_model.GetIndex(), fid.m_mwmId);
- guard.GetOriginalFeatureByIndex(fid.m_index, *feature);
+ if (!guard.GetOriginalFeatureByIndex(fid.m_index, *feature))
+ return nullptr;
feature->ParseEverything();
return feature;
});