third_party/sqlite/sqlite-src-3080704/ext/fts2/fts2_icu.c - Issue 883353008: [sql] Import reference version of SQLite 3.8.7.4.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/sqlite/sqlite-src-3080704/ext/fts2/fts2_icu.c

Issue 883353008: [sql] Import reference version of SQLite 3.8.7.4. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master

Patch Set: Hold back encoding change which is messing up patch. Created 5 years, 11 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:

Index: third_party/sqlite/sqlite-src-3080704/ext/fts2/fts2_icu.c

diff --git a/third_party/sqlite/sqlite-src-3070603/ext/fts2/fts2_icu.c b/third_party/sqlite/sqlite-src-3080704/ext/fts2/fts2_icu.c

similarity index 98%

copy from third_party/sqlite/sqlite-src-3070603/ext/fts2/fts2_icu.c

copy to third_party/sqlite/sqlite-src-3080704/ext/fts2/fts2_icu.c

index de8e116bb906c59ef5352f6b39973399427621d1..2670301f5198f3712b2afb9b87d5a45e80059201 100644

--- a/third_party/sqlite/sqlite-src-3070603/ext/fts2/fts2_icu.c

+++ b/third_party/sqlite/sqlite-src-3080704/ext/fts2/fts2_icu.c

@@ -118,7 +118,7 @@ static int icuOpen(

nChar = nInput+1;

pCsr = (IcuCursor *)sqlite3_malloc(

sizeof(IcuCursor) + /* IcuCursor */

- nChar * sizeof(UChar) + /* IcuCursor.aChar[] */

+ ((nChar+3)&~3) * sizeof(UChar) + /* IcuCursor.aChar[] */

(nChar+1) * sizeof(int) /* IcuCursor.aOffset[] */

);

if( !pCsr ){

@@ -126,7 +126,7 @@ static int icuOpen(

}

memset(pCsr, 0, sizeof(IcuCursor));

pCsr->aChar = (UChar *)&pCsr[1];

- pCsr->aOffset = (int *)&pCsr->aChar[nChar];

+ pCsr->aOffset = (int *)&pCsr->aChar[(nChar+3)&~3];

pCsr->aOffset[iOut] = iInput;

U8_NEXT(zInput, iInput, nInput, c);