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

base/i18n/icu_encoding_detection.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/icu_encoding_detection.h"
 
 #include <set>
 
 #include "base/string_util.h"
 #include "unicode/ucsdet.h"
 
 namespace base {
 
 bool DetectEncoding(const std::string& text, std::string* encoding) {
   if (IsStringASCII(text)) {
     *encoding = std::string();
     return true;
   }
 
   UErrorCode status = U_ZERO_ERROR;
   UCharsetDetector* detector = ucsdet_open(&status);
   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

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

Please remove this comment, no need for that.

+  if (match == NULL)
+    return false;
   const char* detected_encoding = ucsdet_getName(match, &status);
   ucsdet_close(detector);
 
   if (U_FAILURE(status))
     return false;
 
   *encoding = detected_encoding;
   return true;
 }
 
@@ skipping 58 matching lines @@
     if (sniffed_encodings.find(name) == sniffed_encodings.end())
       encodings->push_back(name);
   }
   uenum_close(detectable_encodings);
 
   ucsdet_close(detector);
   return !encodings->empty();
 }
 
 }  // namespace base