Index: url/url_canon_icu.cc |
=================================================================== |
--- url/url_canon_icu.cc (revision 215936) |
+++ url/url_canon_icu.cc (working copy) |
@@ -7,7 +7,9 @@ |
#include <stdlib.h> |
#include <string.h> |
+#include "base/lazy_instance.h" |
#include "base/logging.h" |
+#include "base/synchronization/lock.h" |
#include "third_party/icu/source/common/unicode/ucnv.h" |
#include "third_party/icu/source/common/unicode/ucnv_cb.h" |
#include "third_party/icu/source/common/unicode/uidna.h" |
@@ -107,6 +109,9 @@ |
} while (true); |
} |
+static base::LazyInstance<base::Lock>::Leaky |
+ g_uidna_lock = LAZY_INSTANCE_INITIALIZER; |
+ |
// Converts the Unicode input representing a hostname to ASCII using IDN rules. |
// The output must be ASCII, but is represented as wide characters. |
// |
@@ -116,25 +121,50 @@ |
// the length of the output will be set to the length of the new host name. |
// |
// On error, this will return false. The output in this case is undefined. |
+// TODO(jungshik): use UTF-8/ASCII version of nameToASCII. |
+// Change the function signature and callers accordingly to avoid unnecessary |
+// conversions in our code. In addition, consider using icu::IDNA's UTF-8/ASCII |
+// version with StringByteSink. That way, we can avoid C wrappers and additional |
+// string conversion. |
bool IDNToASCII(const base::char16* src, int src_len, CanonOutputW* output) { |
DCHECK(output->length() == 0); // Output buffer is assumed empty. |
+ |
+ static UIDNA* uidna = NULL; // will be leaked. |
brettw
2013/09/18 19:39:00
Here you make a lazy lock to protect initializatio
jungshik at Google
2013/09/18 21:50:13
I considered that, but gave it up because it appea
|
+ { |
+ UErrorCode err = U_ZERO_ERROR; |
+ base::AutoLock lock(g_uidna_lock.Get()); |
+ if (uidna == NULL) { |
+ // This is the option closest to what we had in the past with IDNA 2003 |
+ // API and matches what IE 10 does except for BiDi check. |
+ // IDNA 2003 always checks BiDi. We used to allow unassigned code |
+ // points. However, with our Unicode DB pretty up to date, we'd not |
+ // need to turn this on. |
+ // We didn't use STD3 rules and we continue not to. |
+ // TODO(jungshik) : Change options as different parties (browsers, |
+ // registrars, search engines) converge toward a consensus. |
+ int32_t options = UIDNA_CHECK_BIDI; |
+ uidna = uidna_openUTS46(options, &err); |
+ if (U_FAILURE(err)) |
+ return false; |
+ } |
+ } |
while (true) { |
- // Use ALLOW_UNASSIGNED to be more tolerant of hostnames that violate |
- // the spec (which do exist). This does not present any risk and is a |
- // little more future proof. |
UErrorCode err = U_ZERO_ERROR; |
- int num_converted = uidna_IDNToASCII(src, src_len, output->data(), |
- output->capacity(), |
- UIDNA_ALLOW_UNASSIGNED, NULL, &err); |
- if (err == U_ZERO_ERROR) { |
- output->set_length(num_converted); |
+ UIDNAInfo info = UIDNA_INFO_INITIALIZER; |
+ int output_length = uidna_nameToASCII(uidna, src, src_len, output->data(), |
+ output->capacity(), &info, &err); |
+ if (U_SUCCESS(err) && info.errors == 0) { |
+ output->set_length(output_length); |
return true; |
} |
- if (err != U_BUFFER_OVERFLOW_ERROR) |
+ |
+ // TODO(jungshik): Look at info.errors to handle them case-by-case basis |
+ // if necessary. |
+ if (err != U_BUFFER_OVERFLOW_ERROR || info.errors != 0) |
return false; // Unknown error, give up. |
// Not enough room in our buffer, expand. |
- output->Resize(output->capacity() * 2); |
+ output->Resize(output_length); |
} |
} |