From 6c899af9e17159b389db138c545ed1d9b2a6b901 Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Tue, 9 Jan 2018 15:45:21 +0300
Subject: [PATCH] [editor] names validation fix

---
 indexer/editable_map_object.cpp                    | 2 +-
 indexer/indexer_tests/editable_map_object_test.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp
index a174ed20e0..e46508c288 100644
--- a/indexer/editable_map_object.cpp
+++ b/indexer/editable_map_object.cpp
@@ -763,7 +763,7 @@ bool EditableMapObject::ValidateName(string const & name)
     return true;
 
   if (strings::IsASCIIString(name))
-    return regex_match(name, regex(R"(^[ A-Za-z0-9.,?!@#$%()\-:;"'`]+$)"));
+    return regex_match(name, regex(R"(^[ A-Za-z0-9.,?!@#$%&()\-:;"'`]+$)"));
 
   std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter;
 
diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/indexer/indexer_tests/editable_map_object_test.cpp
index f28591ffa8..ca7f9b2cd2 100644
--- a/indexer/indexer_tests/editable_map_object_test.cpp
+++ b/indexer/indexer_tests/editable_map_object_test.cpp
@@ -190,7 +190,7 @@ UNIT_TEST(EditableMapObject_ValidateEmail)
 UNIT_TEST(EditableMapObject_ValidateName)
 {
   vector<string> correctNames = {"abc", "абв", "ᆺᆯㅕ", "꫞ꪺꫀꪸ", "a b?c", "a!b.c", "a(b)c", "a,b.c",
-                                 "a$bc", "a%bc", "a#bc", "a№bc"};
+                                 "a$bc", "a%bc", "a#bc", "a№bc", "c&a"};
   vector<string> incorrectNames = {"a^bc", "a~bc", "a§bc", "a>bc", "a<bc", "a{bc", "a[bc", "*",
                                    "a*bc", "a=bc", "a_bc", "a±bc", "a\nbc", "a\tbc", "a\rbc",
                                    "a\vbc", "a\fbc", "a|bc", "N√", "Hello World!\U0001F600",