Changeset 242353 in webkit

Timestamp:

Mar 4, 2019, 7:18:42 AM (7 years ago)

Author:

Michael Catanzaro

Message:

URLHelpers should use unorm2_quickCheck before converting to NFC
​https://bugs.webkit.org/show_bug.cgi?id=194272

Reviewed by Darin Adler.

If the string is already in normalization form C, don't try to normalize it.

• wtf/URLHelpers.cpp:

(WTF::URLHelpers::toNormalizationFormC):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/URLHelpers.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-03-04  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        URLHelpers should use unorm2_quickCheck before converting to NFC
+        https://bugs.webkit.org/show_bug.cgi?id=194272
+
+        Reviewed by Darin Adler.
+
+        If the string is already in normalization form C, don't try to normalize it.
+
+        * wtf/URLHelpers.cpp:
+        (WTF::URLHelpers::toNormalizationFormC):
+
 2019-03-02  Darin Adler  <darin@apple.com>
 

trunk/Source/WTF/wtf/URLHelpers.cpp

@@ -776 +776 @@
 static String toNormalizationFormC(const String& string)
 {
-    auto sourceBuffer = string.charactersWithNullTermination();
+    Vector<UChar> sourceBuffer = string.charactersWithNullTermination();
     ASSERT(sourceBuffer.last() == '\0');
     sourceBuffer.removeLast();
 
-    String result;
+    UErrorCode uerror = U_ZERO_ERROR;
+    const UNormalizer2* normalizer = unorm2_getNFCInstance(&uerror);
+    if (U_FAILURE(uerror))
+        return { };
+
+    UNormalizationCheckResult checkResult = unorm2_quickCheck(normalizer, sourceBuffer.data(), sourceBuffer.size(), &uerror);
+    if (U_FAILURE(uerror))
+        return { };
+
+    // No need to normalize if already normalized.
+    if (checkResult == UNORM_YES)
+        return string;
+
     Vector<UChar, urlBytesBufferLength> normalizedCharacters(sourceBuffer.size());
-    UErrorCode uerror = U_ZERO_ERROR;
-    int32_t normalizedLength = 0;
-    const UNormalizer2* normalizer = unorm2_getNFCInstance(&uerror);
-    if (!U_FAILURE(uerror)) {
-        normalizedLength = unorm2_normalize(normalizer, sourceBuffer.data(), sourceBuffer.size(), normalizedCharacters.data(), normalizedCharacters.size(), &uerror);
-        if (uerror == U_BUFFER_OVERFLOW_ERROR) {
-            uerror = U_ZERO_ERROR;
-            normalizedCharacters.resize(normalizedLength);
-            normalizedLength = unorm2_normalize(normalizer, sourceBuffer.data(), sourceBuffer.size(), normalizedCharacters.data(), normalizedLength, &uerror);
-        }
-        if (!U_FAILURE(uerror))
-            result = String(normalizedCharacters.data(), normalizedLength);
-    }
-
-    return result;
+    auto normalizedLength = unorm2_normalize(normalizer, sourceBuffer.data(), sourceBuffer.size(), normalizedCharacters.data(), normalizedCharacters.size(), &uerror);
+    if (uerror == U_BUFFER_OVERFLOW_ERROR) {
+        uerror = U_ZERO_ERROR;
+        normalizedCharacters.resize(normalizedLength);
+        normalizedLength = unorm2_normalize(normalizer, sourceBuffer.data(), sourceBuffer.size(), normalizedCharacters.data(), normalizedLength, &uerror);
+    }
+    if (U_FAILURE(uerror))
+        return { };
+
+    return String(normalizedCharacters.data(), normalizedLength);
 }