2010-10-12 15:57:08 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2012-10-08 10:00:18 +01:00
|
|
|
/*
|
|
|
|
* This file is part of the LibreOffice project.
|
|
|
|
*
|
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
*
|
|
|
|
* This file incorporates work covered by the following license notice:
|
|
|
|
*
|
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
|
|
* with this work for additional information regarding copyright
|
|
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
|
|
* except in compliance with the License. You may obtain a copy of
|
|
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
|
|
*/
|
2007-06-19 15:00:49 +00:00
|
|
|
|
Don't read past end of string in Guess ctor
<https://ci.libreoffice.org//job/lo_ubsan/1082/>:
> ==26422==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x604000accc72 at pc 0x2ae43e63f4b6 bp 0x2ae43e600510 sp 0x2ae43e600508
> READ of size 1 at 0x604000accc72 thread T70 (cppu_threadpool)
> #0 0x2ae43e63f4b5 in Guess::Guess(char const*) /lingucomponent/source/languageguessing/guess.cxx:95:28
> #1 0x2ae43e667f2f in SimpleGuesser::GetManagedLanguages(char) /lingucomponent/source/languageguessing/simpleguesser.cxx:169:19
> #2 0x2ae43e668420 in SimpleGuesser::GetAvailableLanguages() /lingucomponent/source/languageguessing/simpleguesser.cxx:179:12
> #3 0x2ae43e64a18e in LangGuess_Impl::getEnabledLanguages() /lingucomponent/source/languageguessing/guesslang.cxx:229:24
[...]
> 0x604000accc72 is located 0 bytes to the right of 34-byte region [0x604000accc50,0x604000accc72)
> allocated by thread T70 (cppu_threadpool) here:
[...]
> #7 0x2ae43e65350a in std::string::operator+=(char const*) /home/tdf/lode/opt_private/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/../../../../include/c++/5.2.0/bits/basic_string.h:3355:16
> #8 0x2ae43e667e6e in SimpleGuesser::GetManagedLanguages(char) /lingucomponent/source/languageguessing/simpleguesser.cxx:168:21
> #9 0x2ae43e668420 in SimpleGuesser::GetAvailableLanguages() /lingucomponent/source/languageguessing/simpleguesser.cxx:179:12
> #10 0x2ae43e64a18e in LangGuess_Impl::getEnabledLanguages() /lingucomponent/source/languageguessing/guesslang.cxx:229:24
[...]
shows, during UITest_librelogo, the Guess ctor making wrong assumptions about
the structure of guess_str and skipping over the terminating NUL. Locally I
could see that while most inputs do have the expected syntax of starting with
"[" and containing two "-", one input is indeed just "[haw-utf8" without a
second "-".
I don't know where the strings passed into the Guess ctor in the two places in
lingucomponent/source/languageguessing/simpleguesser.cxx ultimately come from,
and what their guaranteed syntax and their semantics is. So from the existing
code and the non--well-formed "[haw-utf8" sample (where the second segment shall
apparently designate an encoding, not a country), construct rules how to
robustly parse any input into potential language/country/encoding parts. (What
is obvious from the call sites is that for one each input will start with "[",
and for another the item to parse need neither be "]"- nor NUL-terminated.)
(Guess::encoding_str and the local enc variable have effectively been unused
ever since the code's introduction in 0762811922c4e1a3474bdd91daf308baafbc18e4
"INTEGRATION: CWS languageguessing". Guess::encoding_str, but not the local
enc variable, got later removed with b275246c30ce3796cd22f72cd82c58b5cf4c86f0
"loplugin:unusedfields in formula..registry".)
Change-Id: Icbedc05ed5b119ee4efbc3118cc17076a4d80c74
Reviewed-on: https://gerrit.libreoffice.org/62390
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-26 13:16:57 +02:00
|
|
|
#include <sal/config.h>
|
|
|
|
|
|
|
|
#include <cassert>
|
2007-06-19 15:00:49 +00:00
|
|
|
#include <iostream>
|
2008-02-04 12:44:39 +00:00
|
|
|
#include <string.h>
|
2007-06-19 15:00:49 +00:00
|
|
|
|
2012-11-10 10:53:51 +01:00
|
|
|
#ifdef SYSTEM_LIBEXTTEXTCAT
|
2011-10-04 22:34:32 +02:00
|
|
|
#include <libexttextcat/textcat.h>
|
2012-11-09 17:25:56 -05:00
|
|
|
#else
|
|
|
|
#include <textcat.h>
|
|
|
|
#endif
|
2016-05-11 03:42:21 +05:30
|
|
|
|
2017-10-23 22:38:06 +02:00
|
|
|
#include "guess.hxx"
|
2007-06-19 15:00:49 +00:00
|
|
|
|
2013-06-08 22:14:28 +02:00
|
|
|
/* Old textcat.h versions defined bad spelled constants. */
|
|
|
|
#ifndef TEXTCAT_RESULT_UNKNOWN_STR
|
|
|
|
#define TEXTCAT_RESULT_UNKNOWN_STR _TEXTCAT_RESULT_UNKOWN
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef TEXTCAT_RESULT_SHORT_STR
|
|
|
|
#define TEXTCAT_RESULT_SHORT_STR _TEXTCAT_RESULT_SHORT
|
|
|
|
#endif
|
|
|
|
|
2007-06-19 15:00:49 +00:00
|
|
|
using namespace std;
|
|
|
|
|
|
|
|
Guess::Guess()
|
2015-03-01 17:06:38 +01:00
|
|
|
: language_str(DEFAULT_LANGUAGE)
|
|
|
|
, country_str(DEFAULT_COUNTRY)
|
2007-06-19 15:00:49 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* this use a char * string to build the guess object
|
|
|
|
* a string like those is made as : [language-country-encoding]...
|
|
|
|
*
|
|
|
|
*/
|
2011-09-26 22:32:26 +01:00
|
|
|
Guess::Guess(const char * guess_str)
|
2015-03-01 17:06:10 +01:00
|
|
|
: language_str(DEFAULT_LANGUAGE)
|
|
|
|
, country_str(DEFAULT_COUNTRY)
|
2007-06-19 15:00:49 +00:00
|
|
|
{
|
|
|
|
//if the guess is not like "UNKNOWN" or "SHORT", go into the brackets
|
2015-05-11 12:50:06 +02:00
|
|
|
if(strcmp(guess_str + 1, TEXTCAT_RESULT_UNKNOWN_STR) != 0
|
2014-02-26 16:06:37 +01:00
|
|
|
&&
|
2015-05-11 12:50:06 +02:00
|
|
|
strcmp(guess_str + 1, TEXTCAT_RESULT_SHORT_STR) != 0)
|
2014-02-26 16:06:37 +01:00
|
|
|
{
|
Don't read past end of string in Guess ctor
<https://ci.libreoffice.org//job/lo_ubsan/1082/>:
> ==26422==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x604000accc72 at pc 0x2ae43e63f4b6 bp 0x2ae43e600510 sp 0x2ae43e600508
> READ of size 1 at 0x604000accc72 thread T70 (cppu_threadpool)
> #0 0x2ae43e63f4b5 in Guess::Guess(char const*) /lingucomponent/source/languageguessing/guess.cxx:95:28
> #1 0x2ae43e667f2f in SimpleGuesser::GetManagedLanguages(char) /lingucomponent/source/languageguessing/simpleguesser.cxx:169:19
> #2 0x2ae43e668420 in SimpleGuesser::GetAvailableLanguages() /lingucomponent/source/languageguessing/simpleguesser.cxx:179:12
> #3 0x2ae43e64a18e in LangGuess_Impl::getEnabledLanguages() /lingucomponent/source/languageguessing/guesslang.cxx:229:24
[...]
> 0x604000accc72 is located 0 bytes to the right of 34-byte region [0x604000accc50,0x604000accc72)
> allocated by thread T70 (cppu_threadpool) here:
[...]
> #7 0x2ae43e65350a in std::string::operator+=(char const*) /home/tdf/lode/opt_private/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/../../../../include/c++/5.2.0/bits/basic_string.h:3355:16
> #8 0x2ae43e667e6e in SimpleGuesser::GetManagedLanguages(char) /lingucomponent/source/languageguessing/simpleguesser.cxx:168:21
> #9 0x2ae43e668420 in SimpleGuesser::GetAvailableLanguages() /lingucomponent/source/languageguessing/simpleguesser.cxx:179:12
> #10 0x2ae43e64a18e in LangGuess_Impl::getEnabledLanguages() /lingucomponent/source/languageguessing/guesslang.cxx:229:24
[...]
shows, during UITest_librelogo, the Guess ctor making wrong assumptions about
the structure of guess_str and skipping over the terminating NUL. Locally I
could see that while most inputs do have the expected syntax of starting with
"[" and containing two "-", one input is indeed just "[haw-utf8" without a
second "-".
I don't know where the strings passed into the Guess ctor in the two places in
lingucomponent/source/languageguessing/simpleguesser.cxx ultimately come from,
and what their guaranteed syntax and their semantics is. So from the existing
code and the non--well-formed "[haw-utf8" sample (where the second segment shall
apparently designate an encoding, not a country), construct rules how to
robustly parse any input into potential language/country/encoding parts. (What
is obvious from the call sites is that for one each input will start with "[",
and for another the item to parse need neither be "]"- nor NUL-terminated.)
(Guess::encoding_str and the local enc variable have effectively been unused
ever since the code's introduction in 0762811922c4e1a3474bdd91daf308baafbc18e4
"INTEGRATION: CWS languageguessing". Guess::encoding_str, but not the local
enc variable, got later removed with b275246c30ce3796cd22f72cd82c58b5cf4c86f0
"loplugin:unusedfields in formula..registry".)
Change-Id: Icbedc05ed5b119ee4efbc3118cc17076a4d80c74
Reviewed-on: https://gerrit.libreoffice.org/62390
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-26 13:16:57 +02:00
|
|
|
// 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;
|
|
|
|
}
|
|
|
|
}
|
2007-06-19 15:00:49 +00:00
|
|
|
}
|
Don't read past end of string in Guess ctor
<https://ci.libreoffice.org//job/lo_ubsan/1082/>:
> ==26422==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x604000accc72 at pc 0x2ae43e63f4b6 bp 0x2ae43e600510 sp 0x2ae43e600508
> READ of size 1 at 0x604000accc72 thread T70 (cppu_threadpool)
> #0 0x2ae43e63f4b5 in Guess::Guess(char const*) /lingucomponent/source/languageguessing/guess.cxx:95:28
> #1 0x2ae43e667f2f in SimpleGuesser::GetManagedLanguages(char) /lingucomponent/source/languageguessing/simpleguesser.cxx:169:19
> #2 0x2ae43e668420 in SimpleGuesser::GetAvailableLanguages() /lingucomponent/source/languageguessing/simpleguesser.cxx:179:12
> #3 0x2ae43e64a18e in LangGuess_Impl::getEnabledLanguages() /lingucomponent/source/languageguessing/guesslang.cxx:229:24
[...]
> 0x604000accc72 is located 0 bytes to the right of 34-byte region [0x604000accc50,0x604000accc72)
> allocated by thread T70 (cppu_threadpool) here:
[...]
> #7 0x2ae43e65350a in std::string::operator+=(char const*) /home/tdf/lode/opt_private/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/../../../../include/c++/5.2.0/bits/basic_string.h:3355:16
> #8 0x2ae43e667e6e in SimpleGuesser::GetManagedLanguages(char) /lingucomponent/source/languageguessing/simpleguesser.cxx:168:21
> #9 0x2ae43e668420 in SimpleGuesser::GetAvailableLanguages() /lingucomponent/source/languageguessing/simpleguesser.cxx:179:12
> #10 0x2ae43e64a18e in LangGuess_Impl::getEnabledLanguages() /lingucomponent/source/languageguessing/guesslang.cxx:229:24
[...]
shows, during UITest_librelogo, the Guess ctor making wrong assumptions about
the structure of guess_str and skipping over the terminating NUL. Locally I
could see that while most inputs do have the expected syntax of starting with
"[" and containing two "-", one input is indeed just "[haw-utf8" without a
second "-".
I don't know where the strings passed into the Guess ctor in the two places in
lingucomponent/source/languageguessing/simpleguesser.cxx ultimately come from,
and what their guaranteed syntax and their semantics is. So from the existing
code and the non--well-formed "[haw-utf8" sample (where the second segment shall
apparently designate an encoding, not a country), construct rules how to
robustly parse any input into potential language/country/encoding parts. (What
is obvious from the call sites is that for one each input will start with "[",
and for another the item to parse need neither be "]"- nor NUL-terminated.)
(Guess::encoding_str and the local enc variable have effectively been unused
ever since the code's introduction in 0762811922c4e1a3474bdd91daf308baafbc18e4
"INTEGRATION: CWS languageguessing". Guess::encoding_str, but not the local
enc variable, got later removed with b275246c30ce3796cd22f72cd82c58b5cf4c86f0
"loplugin:unusedfields in formula..registry".)
Change-Id: Icbedc05ed5b119ee4efbc3118cc17076a4d80c74
Reviewed-on: https://gerrit.libreoffice.org/62390
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-26 13:16:57 +02:00
|
|
|
auto const langLen = (dash1 == nullptr ? p : dash1) - start;
|
|
|
|
if (langLen != 0) { // if not we use the default value
|
|
|
|
language_str.assign(start, langLen);
|
2007-06-19 15:00:49 +00:00
|
|
|
}
|
Don't read past end of string in Guess ctor
<https://ci.libreoffice.org//job/lo_ubsan/1082/>:
> ==26422==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x604000accc72 at pc 0x2ae43e63f4b6 bp 0x2ae43e600510 sp 0x2ae43e600508
> READ of size 1 at 0x604000accc72 thread T70 (cppu_threadpool)
> #0 0x2ae43e63f4b5 in Guess::Guess(char const*) /lingucomponent/source/languageguessing/guess.cxx:95:28
> #1 0x2ae43e667f2f in SimpleGuesser::GetManagedLanguages(char) /lingucomponent/source/languageguessing/simpleguesser.cxx:169:19
> #2 0x2ae43e668420 in SimpleGuesser::GetAvailableLanguages() /lingucomponent/source/languageguessing/simpleguesser.cxx:179:12
> #3 0x2ae43e64a18e in LangGuess_Impl::getEnabledLanguages() /lingucomponent/source/languageguessing/guesslang.cxx:229:24
[...]
> 0x604000accc72 is located 0 bytes to the right of 34-byte region [0x604000accc50,0x604000accc72)
> allocated by thread T70 (cppu_threadpool) here:
[...]
> #7 0x2ae43e65350a in std::string::operator+=(char const*) /home/tdf/lode/opt_private/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/../../../../include/c++/5.2.0/bits/basic_string.h:3355:16
> #8 0x2ae43e667e6e in SimpleGuesser::GetManagedLanguages(char) /lingucomponent/source/languageguessing/simpleguesser.cxx:168:21
> #9 0x2ae43e668420 in SimpleGuesser::GetAvailableLanguages() /lingucomponent/source/languageguessing/simpleguesser.cxx:179:12
> #10 0x2ae43e64a18e in LangGuess_Impl::getEnabledLanguages() /lingucomponent/source/languageguessing/guesslang.cxx:229:24
[...]
shows, during UITest_librelogo, the Guess ctor making wrong assumptions about
the structure of guess_str and skipping over the terminating NUL. Locally I
could see that while most inputs do have the expected syntax of starting with
"[" and containing two "-", one input is indeed just "[haw-utf8" without a
second "-".
I don't know where the strings passed into the Guess ctor in the two places in
lingucomponent/source/languageguessing/simpleguesser.cxx ultimately come from,
and what their guaranteed syntax and their semantics is. So from the existing
code and the non--well-formed "[haw-utf8" sample (where the second segment shall
apparently designate an encoding, not a country), construct rules how to
robustly parse any input into potential language/country/encoding parts. (What
is obvious from the call sites is that for one each input will start with "[",
and for another the item to parse need neither be "]"- nor NUL-terminated.)
(Guess::encoding_str and the local enc variable have effectively been unused
ever since the code's introduction in 0762811922c4e1a3474bdd91daf308baafbc18e4
"INTEGRATION: CWS languageguessing". Guess::encoding_str, but not the local
enc variable, got later removed with b275246c30ce3796cd22f72cd82c58b5cf4c86f0
"loplugin:unusedfields in formula..registry".)
Change-Id: Icbedc05ed5b119ee4efbc3118cc17076a4d80c74
Reviewed-on: https://gerrit.libreoffice.org/62390
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-26 13:16:57 +02:00
|
|
|
if (dash2 != nullptr) {
|
|
|
|
country_str.assign(dash1 + 1, dash2 - (dash1 + 1));
|
2007-06-19 15:00:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-12 15:57:08 +02:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|