From 468f6a563bff0904f96a1399d1ed59a32a14e3e3 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Wed, 27 Jul 2016 17:34:22 +0300
Subject: [PATCH] Reveiw fixes.

---
 indexer/altitude_loader.cpp  | 7 ++++---
 indexer/feature_altitude.hpp | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/indexer/altitude_loader.cpp b/indexer/altitude_loader.cpp
index 4041e23831..f253056543 100644
--- a/indexer/altitude_loader.cpp
+++ b/indexer/altitude_loader.cpp
@@ -87,10 +87,11 @@ TAltitudes const & AltitudeLoader::GetAltitudes(uint32_t featureId, size_t point
     Altitudes altitudes;
     ReaderSource<FilesContainerR::TReader> src(*m_reader);
     src.Skip(altitudeInfoOffsetInSection);
-    altitudes.Deserialize(m_header.m_minAltitude, pointCount, src);
+    bool const isDeserialized = altitudes.Deserialize(m_header.m_minAltitude, pointCount, src);
 
-    bool const allValid = none_of(altitudes.m_altitudes.begin(), altitudes.m_altitudes.end(),
-                                  [](TAltitude a) { return a == kInvalidAltitude; });
+    bool const allValid = isDeserialized
+        && none_of(altitudes.m_altitudes.begin(), altitudes.m_altitudes.end(),
+                   [](TAltitude a) { return a == kInvalidAltitude; });
     if (!allValid)
     {
       ASSERT(false, (altitudes.m_altitudes));
diff --git a/indexer/feature_altitude.hpp b/indexer/feature_altitude.hpp
index 862b3e3edf..81b0c918ed 100644
--- a/indexer/feature_altitude.hpp
+++ b/indexer/feature_altitude.hpp
@@ -22,6 +22,7 @@ struct AltitudeHeader
   using TAltitudeSectionVersion = uint16_t;
 
   AltitudeHeader() { Reset(); }
+
   template <class TSink>
   void Serialize(TSink & sink) const
   {
@@ -91,13 +92,13 @@ public:
   }
 
   template <class TSource>
-  void Deserialize(TAltitude minAltitude, size_t pointCount, TSource & src)
+  bool Deserialize(TAltitude minAltitude, size_t pointCount, TSource & src)
   {
     m_altitudes.clear();
     if (pointCount == 0)
     {
       ASSERT(false, ());
-      return;
+      return false;
     }
 
     m_altitudes.resize(pointCount);
@@ -109,10 +110,11 @@ public:
       {
         ASSERT(false, ());
         m_altitudes.clear();
-        return;
+        return false;
       }
       prevAltitude = m_altitudes[i];
     }
+    return true;
   }
 
   /// \note |m_altitudes| is a vector of feature point altitudes. There's two possibilities: