Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Unified Diff: third_party/sqlite/patches/0012-Use-safe-macros-for-UTF-8-iteration-in-sqlite-icu-ex.patch

Issue 2751253002: [sql] Import SQLite 3.17.0. (Closed)
Patch Set: also clang on Linux i386 Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/sqlite/patches/0012-Use-safe-macros-for-UTF-8-iteration-in-sqlite-icu-ex.patch
diff --git a/third_party/sqlite/patches/0012-Use-safe-macros-for-UTF-8-iteration-in-sqlite-icu-ex.patch b/third_party/sqlite/patches/0012-Use-safe-macros-for-UTF-8-iteration-in-sqlite-icu-ex.patch
deleted file mode 100644
index a5d9dd57d75f1bec8e8b8efd8ff8e0506073bcd2..0000000000000000000000000000000000000000
--- a/third_party/sqlite/patches/0012-Use-safe-macros-for-UTF-8-iteration-in-sqlite-icu-ex.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 840d5ead53a23f8e1f54db479f2f5fc27f5821bf Mon Sep 17 00:00:00 2001
-From: Scott Hess <shess@chromium.org>
-Date: Mon, 1 Feb 2016 17:07:24 -0800
-Subject: [PATCH 12/12] Use safe macros for UTF-8 iteration in sqlite icu
- extension.
-
-Instead of U8_NEXT_UNSAFE and U8_FWD1_UNSAFE, use
-U8_NEXT_OR_FFFD (efficient) and U8_FWD1 (slower than UNSAFE version).
-
-BUG=575205
----
- third_party/sqlite/src/ext/icu/icu.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/third_party/sqlite/src/ext/icu/icu.c b/third_party/sqlite/src/ext/icu/icu.c
-index a2ff492..7e2b800 100644
---- a/third_party/sqlite/src/ext/icu/icu.c
-+++ b/third_party/sqlite/src/ext/icu/icu.c
-@@ -82,7 +82,7 @@ static int icuLikeCompare(
-
- /* Read (and consume) the next character from the input pattern. */
- UChar32 uPattern;
-- U8_NEXT_UNSAFE(zPattern, iPattern, uPattern);
-+ U8_NEXT_OR_FFFD(zPattern, iPattern, -1, uPattern);
-
- /* There are now 4 possibilities:
- **
-@@ -102,7 +102,7 @@ static int icuLikeCompare(
- while( (c=zPattern[iPattern]) == MATCH_ALL || c == MATCH_ONE ){
- if( c==MATCH_ONE ){
- if( zString[iString]==0 ) return 0;
-- U8_FWD_1_UNSAFE(zString, iString);
-+ U8_FWD_1(zString, iString, -1);
- }
- iPattern++;
- }
-@@ -113,14 +113,14 @@ static int icuLikeCompare(
- if( icuLikeCompare(&zPattern[iPattern], &zString[iString], uEsc) ){
- return 1;
- }
-- U8_FWD_1_UNSAFE(zString, iString);
-+ U8_FWD_1(zString, iString, -1);
- }
- return 0;
-
- }else if( !prevEscape && uPattern==MATCH_ONE ){
- /* Case 2. */
- if( zString[iString]==0 ) return 0;
-- U8_FWD_1_UNSAFE(zString, iString);
-+ U8_FWD_1(zString, iString, -1);
-
- }else if( !prevEscape && uPattern==uEsc){
- /* Case 3. */
-@@ -129,7 +129,7 @@ static int icuLikeCompare(
- }else{
- /* Case 4. */
- UChar32 uString;
-- U8_NEXT_UNSAFE(zString, iString, uString);
-+ U8_NEXT_OR_FFFD(zString, iString, -1, uString);
- uString = u_foldCase(uString, U_FOLD_CASE_DEFAULT);
- uPattern = u_foldCase(uPattern, U_FOLD_CASE_DEFAULT);
- if( uString!=uPattern ){
---
-2.7.0
-

Powered by Google App Engine
This is Rietveld 408576698