Fix a bug in icuOpen() in fts2. (CVS 6038)

FossilOrigin-Name: b9c722bd96b44e0fabd1564ddd982d2aabb7047c

diff --git a/ext/fts2/fts2_icu.c b/ext/fts2/fts2_icu.c
index c8b30adf5c08bfdd30114c770d93f1af1e383bc8..de8e116bb906c59ef5352f6b39973399427621d1 100644 (file)
--- a/ext/fts2/fts2_icu.c
+++ b/ext/fts2/fts2_icu.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file implements a tokenizer for fts2 based on the ICU library.
 ** 
-** $Id: fts2_icu.c,v 1.2 2008/07/22 22:20:50 shess Exp $
+** $Id: fts2_icu.c,v 1.3 2008/12/18 05:30:26 danielk1977 Exp $
 */
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS2)
@@ -112,7 +112,9 @@ static int icuOpen(
 
   *ppCursor = 0;
 
-  if( -1 == nInput ) nInput = strlen(nInput);
+  if( nInput<0 ){
+    nInput = strlen(zInput);
+  }
   nChar = nInput+1;
   pCsr = (IcuCursor *)sqlite3_malloc(
       sizeof(IcuCursor) +                /* IcuCursor */

diff --git a/manifest b/manifest
index abbe072de277dafcfa2b9384c340617928ef2008..482944ffe0633818ea5fb7632e70215180a8c657 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sWHERE\sclause\sprocessing\sinfrastructure\sin\spreparation\sfor\sadding\nmulti-index\sOR\sevaluation.\s(CVS\s6037)
-D 2008-12-17T19:22:16
+C Fix\sa\sbug\sin\sicuOpen()\sin\sfts2.\s(CVS\s6038)
+D 2008-12-18T05:30:26
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -44,7 +44,7 @@ F ext/fts2/fts2.c bc78da57642edfcf7ba2fb8a8771f97663449104
 F ext/fts2/fts2.h da5f76c65163301d1068a971fd32f4119e3c95fa
 F ext/fts2/fts2_hash.c 2689e42e1107ea67207f725cf69cf8972d00cf93
 F ext/fts2/fts2_hash.h 9a5b1be94664139f93217a0770d7144425cffb3a
-F ext/fts2/fts2_icu.c 53162e0dbe6d27a0cc24ad2c10cea8c48b7c839b
+F ext/fts2/fts2_icu.c 1ea9993a39c9783c2e2d7446d055e9d64411dda0
 F ext/fts2/fts2_porter.c 8a6369b0fae98c04db95e4fa95fac7c03d7182ec
 F ext/fts2/fts2_tokenizer.c 5cec41326fabe65323945a46fa9495ee85c3d5fd
 F ext/fts2/fts2_tokenizer.h a7e46462d935a314b2682287f12f27530a3ee08e
@@ -679,7 +679,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 34b56600ec0c5cd7b5faab265750252bc9850e3e
-R f6c50ff68624e5438bfedc944eca4eae
-U drh
-Z 9d46e7b6dc85f65598c88f42e3cd2bc3
+P 78401b33febf678cfeec2a35514eb4172de420ab
+R 09419362acc9ec794afd36b3528f0694
+U danielk1977
+Z 152f2d9b602bfeed8b492ec878934f0b

diff --git a/manifest.uuid b/manifest.uuid
index d9fc840f04d1e8ece8be0750d873375412a9361c..69052dd55b0200ab8a49ed99f199e9206a066263 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-78401b33febf678cfeec2a35514eb4172de420ab
\ No newline at end of file
+b9c722bd96b44e0fabd1564ddd982d2aabb7047c
\ No newline at end of file