From 5830f821e25b821e013a125a0980276d27aedf1e Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Wed, 29 Nov 2017 16:16:35 +0300
Subject: [editor] validate name crash fix

---
 indexer/editable_map_object.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'indexer/editable_map_object.cpp')

diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp
index 82728b3f1d..a80c22deea 100644
--- a/indexer/editable_map_object.cpp
+++ b/indexer/editable_map_object.cpp
@@ -772,7 +772,16 @@ bool EditableMapObject::ValidateName(string const & name)
 
   std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter;
 
-  std::u32string const u32name = converter.from_bytes(name);
+  std::u32string u32name;
+  try
+  {
+    u32name = converter.from_bytes(name);
+  }
+  catch (std::range_error const &)
+  {
+    // Cannot convert, for ex. it is possible for some emoji.
+    return false;
+  }
 
   std::u32string const excludedSymbols = U"^~§><{}[]*=_±\n\t\r\v\f|√•π÷׶∆°";
 
-- 
cgit v1.2.3