1 files changed, 36 insertions, 39 deletions

diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx
index eefa7ab6c0f0..a2f3be35382b 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <cassert>
 #include <iostream>
 #include <string.h>
 
@@ -39,11 +42,6 @@
 
 using namespace std;
 
-static bool isSeparator(const char c){
-    return c == GUESS_SEPARATOR_OPEN || c == GUESS_SEPARATOR_SEP || c == GUESS_SEPARATOR_CLOSE || c == '\0';
-}
-
-
 Guess::Guess()
     : language_str(DEFAULT_LANGUAGE)
     , country_str(DEFAULT_COUNTRY)
@@ -59,48 +57,47 @@ Guess::Guess(const char * guess_str)
     : language_str(DEFAULT_LANGUAGE)
     , country_str(DEFAULT_COUNTRY)
 {
-    string lang;
-    string country;
-    string enc;
-
     //if the guess is not like "UNKNOWN" or "SHORT", go into the brackets
     if(strcmp(guess_str + 1, TEXTCAT_RESULT_UNKNOWN_STR) != 0
        &&
        strcmp(guess_str + 1, TEXTCAT_RESULT_SHORT_STR) != 0)
     {
-
-        int current_pointer = 0;
-
-        //this is to go to the first char of the guess string ( the '[' of "[en-US-utf8]" )
-        while(!isSeparator(guess_str[current_pointer])){
-            current_pointer++;
+        // From how this ctor is called from SimpleGuesser::GuessLanguage and
+        // SimpleGuesser::GetManagedLanguages in
+        // lingucomponent/source/languageguessing/simpleguesser.cxx, guess_str must start with "[":
+        assert(guess_str[0] == GUESS_SEPARATOR_OPEN);
+        auto const start = guess_str + 1;
+        // Only look at the prefix of guess_str, delimited by the next "]" or "[" or end-of-string;
+        // split it into at most three segments separated by "-" (where excess occurrences of "-"
+        // would become part of the third segment), like "en-US-utf8"; the first segment denotes the
+        // language; if there are three segments, the second denotes the country and the third the
+        // encoding; otherwise, the second segment, if any (e.g., in "haw-utf8"), denotes the
+        // encoding:
+        char const * dash1 = nullptr;
+        char const * dash2 = nullptr;
+        auto p = start;
+        for (;; ++p) {
+            auto const c = *p;
+            if (c == '\0' || c == GUESS_SEPARATOR_OPEN || c == GUESS_SEPARATOR_CLOSE) {
+                break;
+            }
+            if (c == GUESS_SEPARATOR_SEP) {
+                if (dash1 == nullptr) {
+                    dash1 = p;
+                } else {
+                    dash2 = p;
+                    // The encoding is ignored, so we can stop as soon as we found the second "-":
+                    break;
+                }
+            }
         }
-        current_pointer++;
-
-        //this is to pick up the language ( the "en" from "[en-US-utf8]" )
-        while(!isSeparator(guess_str[current_pointer])){
-            lang+=guess_str[current_pointer];
-            current_pointer++;
-        }
-        current_pointer++;
-
-        //this is to pick up the country ( the "US" from "[en-US-utf8]" )
-        while(!isSeparator(guess_str[current_pointer])){
-            country+=guess_str[current_pointer];
-            current_pointer++;
+        auto const langLen = (dash1 == nullptr ? p : dash1) - start;
+        if (langLen != 0) { // if not we use the default value
+            language_str.assign(start, langLen);
         }
-        current_pointer++;
-
-        //this is to pick up the encoding ( the "utf8" from "[en-US-utf8]" )
-        while(!isSeparator(guess_str[current_pointer])){
-            enc+=guess_str[current_pointer];
-            current_pointer++;
-        }
-
-        if(!lang.empty()){//if not we use the default value
-            language_str=lang;
+        if (dash2 != nullptr) {
+            country_str.assign(dash1 + 1, dash2 - (dash1 + 1));
         }
-        country_str=country;
     }
 }