| Index: third_party/sqlite/sqlite-src-3070603/ext/fts3/fts3_icu.c
|
| diff --git a/third_party/sqlite/src/ext/fts3/fts3_icu.c b/third_party/sqlite/sqlite-src-3070603/ext/fts3/fts3_icu.c
|
| similarity index 96%
|
| copy from third_party/sqlite/src/ext/fts3/fts3_icu.c
|
| copy to third_party/sqlite/sqlite-src-3070603/ext/fts3/fts3_icu.c
|
| index e406168d4f39d48cc163f0b5f6353cfe0051435e..85390d3b065b5c422fb07d2bdd69614893f56ccf 100644
|
| --- a/third_party/sqlite/src/ext/fts3/fts3_icu.c
|
| +++ b/third_party/sqlite/sqlite-src-3070603/ext/fts3/fts3_icu.c
|
| @@ -118,15 +118,15 @@ static int icuOpen(
|
| nChar = nInput+1;
|
| pCsr = (IcuCursor *)sqlite3_malloc(
|
| sizeof(IcuCursor) + /* IcuCursor */
|
| - (nChar+1) * sizeof(int) + /* IcuCursor.aOffset[] */
|
| - nChar * sizeof(UChar) /* IcuCursor.aChar[] */
|
| + nChar * sizeof(UChar) + /* IcuCursor.aChar[] */
|
| + (nChar+1) * sizeof(int) /* IcuCursor.aOffset[] */
|
| );
|
| if( !pCsr ){
|
| return SQLITE_NOMEM;
|
| }
|
| memset(pCsr, 0, sizeof(IcuCursor));
|
| - pCsr->aOffset = (int *)&pCsr[1];
|
| - pCsr->aChar = (UChar *)&pCsr->aOffset[nChar+1];
|
| + pCsr->aChar = (UChar *)&pCsr[1];
|
| + pCsr->aOffset = (int *)&pCsr->aChar[nChar];
|
|
|
| pCsr->aOffset[iOut] = iInput;
|
| U8_NEXT(zInput, iInput, nInput, c);
|
| @@ -198,7 +198,7 @@ static int icuNext(
|
|
|
| while( iStart<iEnd ){
|
| int iWhite = iStart;
|
| - U16_NEXT(pCsr->aChar, iWhite, pCsr->nChar, c);
|
| + U8_NEXT(pCsr->aChar, iWhite, pCsr->nChar, c);
|
| if( u_isspace(c) ){
|
| iStart = iWhite;
|
| }else{
|
|
|