Fix bugs in substr() for UTF-8. (CVS 406)

FossilOrigin-Name: e9fd9e7b0fed445b48e7024ecde0354fff1478a6

diff --git a/manifest b/manifest
index 92cd1fe904d266225d87d23ea6c6116625a3242b..69db724eba03498e43e7aa9982e26a746e4e0a22 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunused\sopcodes\sfrom\sthe\sVDBE\sand\sfix\sa\sbug\sin\sthe\ssubstr()\sfunction.\s(CVS\s405)
-D 2002-02-28T03:31:11
+C Fix\sbugs\sin\ssubstr()\sfor\sUTF-8.\s(CVS\s406)
+D 2002-02-28T04:00:12
 F Makefile.in 50f1b3351df109b5774771350d8c1b8d3640130d
 F Makefile.template 89e373b2dad0321df00400fa968dc14b61a03296
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -24,7 +24,7 @@ F src/btree.h 8abeabfe6e0b1a990b64fa457592a6482f6674f3
 F src/build.c 7ada2426caba70cb1072ba268bedb694b5018065
 F src/delete.c 950d8f9097361419f1963875f9943344b469cf02
 F src/expr.c b70bedaffd27ea24c5c2a197a88b07e82dfa4967
-F src/func.c 089b68c021b82d8f3d0f489143d200ddf1eced39
+F src/func.c 0db438ba17f3394dc5a3ffcd2ee41ca0c8e80b21
 F src/hash.c cc259475e358baaf299b00a2c7370f2b03dda892
 F src/hash.h dca065dda89d4575f3176e75e9a3dc0f4b4fb8b9
 F src/insert.c 164d2d5e943268a8ff0594e1947599e04df0ce11
@@ -127,7 +127,7 @@ F www/speed.tcl 83457b2bf6bb430900bd48ca3dd98264d9a916a5
 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
 F www/tclsqlite.tcl 829b393d1ab187fd7a5e978631b3429318885c49
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 7d86749d4a78d05930bae2b6491d9428f06fe836
-R f548275963c89789d73119d8b7f277e5
+P e8611e0c052ddac477f83df485fa5dc882593de0
+R 04ad4c27603a68f224cf2e37abda2702
 U drh
-Z 85324ea3b3c81399d9a571ab6786b2dc
+Z c02824de6ff4d82a6f9d0a682a20821a

diff --git a/manifest.uuid b/manifest.uuid
index 8f91e754d39162bdacf5cabdac90c82f3679fbf7..eb8e06f5606c5c09fd7415e7cb32cfc112de4632 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e8611e0c052ddac477f83df485fa5dc882593de0
\ No newline at end of file
+e9fd9e7b0fed445b48e7024ecde0354fff1478a6
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index 007a3db95ac09c2b30657f656011ac9d936e5167..e995842018fdd25a3f82198734004713fe64fff1 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.11 2002/02/28 03:31:11 drh Exp $
+** $Id: func.c,v 1.12 2002/02/28 04:00:12 drh Exp $
 */
 #include <ctype.h>
 #include <math.h>
@@ -102,7 +102,7 @@ static void substrFunc(sqlite_func *context, int argc, const char **argv){
   p1 = atoi(argv[1]?argv[1]:0);
   p2 = atoi(argv[2]?argv[2]:0);
 #ifdef SQLITE_UTF8
-  for(len=0, z2=z; *z2; z2++){ if( (0xc0&*z)!=0x80 ) len++; }
+  for(len=0, z2=z; *z2; z2++){ if( (0xc0&*z2)!=0x80 ) len++; }
 #else
   len = strlen(z);
 #endif
@@ -121,12 +121,14 @@ static void substrFunc(sqlite_func *context, int argc, const char **argv){
 #ifdef SQLITE_UTF8
   for(i=0; i<p1; i++){
     assert( z[i] );
-    if( (z[i]&0xc0)!=0x80 ) p1++;
+    if( (z[i]&0xc0)==0x80 ) p1++;
   }
+  while( z[i] && (z[i]&0xc0)==0x80 ){ i++; p1++; }
   for(; i<p1+p2; i++){
     assert( z[i] );
-    if( (z[i]&0xc0)!=0x80 ) p2++;
+    if( (z[i]&0xc0)==0x80 ) p2++;
   }
+  while( z[i] && (z[i]&0xc0)==0x80 ){ i++; p2++; }
 #endif
   if( p2<0 ) p2 = 0;
   sqlite_set_result_string(context, &z[p1], p2);