Make DetectEncoding() failed when ucsdet_detect() returls NULL.

Make DetectEncoding() failed when ucsdet_detect() returls NULL.

In some cases, DetectEncoding() crashes and the reason may be becasue
ucsdet_detect() returns NULL with no error status.
(cf. http://crosbug.com/15691)

BUG=http://crosbug.com/15691
TEST=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86509

[zel, 2011-05-24 22:46:48]

LGTM

http://codereview.chromium.org/7064039/diff/1/base/i18n/icu_encoding_detectio...
File base/i18n/icu_encoding_detection.cc (right):

http://codereview.chromium.org/7064039/diff/1/base/i18n/icu_encoding_detectio...
base/i18n/icu_encoding_detection.cc:26: // http://crosbug.com/15691
Please remove this comment, no need for that.

[zel, 2011-05-24 22:49:45]

approved for merge into 742

[brettw, 2011-05-24 22:56:33]

Rubber stamp LGTM

[Nebojša Ćirić, 2011-05-25 16:17:30]

Sorry, was OOO yesterday.

24. мај 2011. 14.24, <yoshiki@chromium.org> је написао/ла:

> Reviewers: Nebojša Ćirić,
>
> Description:
> Make DetectEncoding() failed when ucsdet_detect() returls NULL.
>
> In some cases, DetectEncoding() crashes and the reason may be becasue
> ucsdet_detect() returns NULL with no error status.
> (cf. http://crosbug.com/15691)
>
> BUG=http://crosbug.com/15691
> TEST=none
>
>
> Please review this at http://codereview.chromium.org/7064039/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M base/i18n/icu_encoding_detection.cc
>
>
> Index: base/i18n/icu_encoding_detection.cc
> diff --git a/base/i18n/icu_encoding_detection.cc
> b/base/i18n/icu_encoding_detection.cc
> index
>
3583fa9c5f7436ef02b61e177bc433b488fdc0e6..ce7a372fe13710a36650203765a5439249213c02
> 100644
> --- a/base/i18n/icu_encoding_detection.cc
> +++ b/base/i18n/icu_encoding_detection.cc
> @@ -22,6 +22,10 @@ bool DetectEncoding(const std::string& text,
> std::string* encoding) {
>   ucsdet_setText(detector, text.data(),
> static_cast<int32_t>(text.length()),
>                  &status);
>   const UCharsetMatch* match = ucsdet_detect(detector, &status);
> +  // In case that ucsdet_detect() returns NULL with no error
> +  // http://crosbug.com/15691
> +  if (match == NULL)
> +    return false;
>   const char* detected_encoding = ucsdet_getName(match, &status);
>   ucsdet_close(detector);
>
>
>
>


-- 
Nebojša Ćirić