Import SQLite 3.8.7.4.

third_party/sqlite/src/ext/fts3/fts3_icu.c

 /*
 ** 2007 June 22
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
 **
 **    May you do good and not evil.
 **    May you find forgiveness for yourself and forgive others.
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
 ** This file implements a tokenizer for fts3 based on the ICU library.
-** 
-** $Id: fts3_icu.c,v 1.3 2008/09/01 18:34:20 danielk1977 Exp $
 */
-
+#include "fts3Int.h"
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
 #ifdef SQLITE_ENABLE_ICU
 
 #include <assert.h>
 #include <string.h>
 #include "fts3_tokenizer.h"
 
 #include <unicode/ubrk.h>
 #include <unicode/ucol.h>
 #include <unicode/ustring.h>
@@ skipping 78 matching lines @@
   const int32_t opt = U_FOLD_CASE_DEFAULT;
   UErrorCode status = U_ZERO_ERROR;
   int nChar;
 
   UChar32 c;
   int iInput = 0;
   int iOut = 0;
 
   *ppCursor = 0;
 
-  if( nInput<0 ){
+  if( zInput==0 ){
+    nInput = 0;
+    zInput = "";
+  }else if( nInput<0 ){
     nInput = strlen(zInput);
   }
   nChar = nInput+1;
   pCsr = (IcuCursor *)sqlite3_malloc(
       sizeof(IcuCursor) +                /* IcuCursor */
-      (nChar+1) * sizeof(int) +          /* IcuCursor.aOffset[] */
-      nChar * sizeof(UChar)              /* IcuCursor.aChar[] */
+      ((nChar+3)&~3) * 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+3)&~3];
 
   pCsr->aOffset[iOut] = iInput;
   U8_NEXT(zInput, iInput, nInput, c); 
   while( c>0 ){
     int isError = 0;
     c = u_foldCase(c, opt);
     U16_APPEND(pCsr->aChar, iOut, nChar, c, isError);
     if( isError ){
       sqlite3_free(pCsr);
       return SQLITE_ERROR;
@@ skipping 111 matching lines @@
 ** Set *ppModule to point at the implementation of the ICU tokenizer.
 */
 void sqlite3Fts3IcuTokenizerModule(
   sqlite3_tokenizer_module const**ppModule
 ){
   *ppModule = &icuTokenizerModule;
 }
 
 #endif /* defined(SQLITE_ENABLE_ICU) */
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */