Fixed problem in string shrinking

maca_common/src/util.cpp

@@ -472,15 +472,29 @@ std::string shrinkString(const std::string & base, int maxSize, const std::strin
   int tokenSize = getNbSymbols(token);
 
   if (baseSize <= maxSize)
+  {
+    if (!utf8::is_valid(base.begin(), base.end()))
+    {
+      fprintf(stderr, "ERROR (%s) : ShrinkString with base=<%s> maxSize=<%d> token=<%s> produced the following invalid UTF-8 string <%s>. Aborting.\n", ERRINFO, base.c_str(), maxSize, token.c_str(), base.c_str());
+      exit(1);
+    }
     return base;
+  }
 
   int nbToTakeBegin = ((maxSize-tokenSize) / 2) + ((maxSize-tokenSize)%2);
   int nbToTakeEnd = maxSize-tokenSize-nbToTakeBegin;
 
-  std::string result(base.begin(), base.begin()+getEndIndexOfNthSymbol(base, nbToTakeBegin));
+  std::string result(base.begin(), base.begin()+getEndIndexOfNthSymbol(base, nbToTakeBegin-1)+1);
+  std::string strBegin = result;
   result += token;
   result += std::string(base.begin()+getStartIndexOfNthSymbol(base,baseSize-nbToTakeEnd), base.end());
 
+  if (!utf8::is_valid(result.begin(), result.end()))
+  {
+    fprintf(stderr, "ERROR (%s) : ShrinkString with base=<%s> maxSize=<%d> token=<%s> produced the following invalid UTF-8 string <%s>. Aborting.\n", ERRINFO, base.c_str(), maxSize, token.c_str(), result.c_str());
+    exit(1);
+  }
+
   return result;
 }