Fix the zInit[] optimization of test_regexp.c when the initial string

contains 3-byte UTF8 characters.

FossilOrigin-Name: 357231ec970adb5dfcdaf9665499141004cb1198

diff --git a/manifest b/manifest
index 964e3c070ca76d8e726ed969ad9d0c61ac367b59..9f571934d7445f8195dc9529368e17fc788ff3b2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bring\sback\stest_regexp\schanges\sthat\swere\smade\swhen\sporting\sto\sFossil.\s\sAlso\nfix\ssome\sbugs\sthat\swere\sintroduced\sby\sthe\sFossil\sport.
-D 2013-01-03T19:34:46.935
+C Fix\sthe\szInit[]\soptimization\sof\stest_regexp.c\swhen\sthe\sinitial\sstring\ncontains\s3-byte\sUTF8\scharacters.
+D 2013-01-04T14:06:24.780
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -217,7 +217,7 @@ F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba
 F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
 F src/test_quota.c 0e0e2e3bf6766b101ecccd8c042b66e44e9be8f5
 F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
-F src/test_regexp.c 8d91d00e45e899eb13575bec4870ce415900bec6
+F src/test_regexp.c 8412a929f032161e05faf1dccf1eaf35dfcd33d0
 F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
@@ -1031,7 +1031,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 99127a669c49f82918853091c9c5b7db5ad73cba
-R c3dfd34890a9fadadecfeeae8889e37f
+P 45c158b1a015e0295244982e7a61ecc55cca8436
+R dfda34464b7f03b42f200d90bee227fb
 U drh
-Z 1e14e89eb51110980c945c9622f22c94
+Z e8d27e55703874a67ca5ac33b5152982

diff --git a/manifest.uuid b/manifest.uuid
index 83cfaa7c7495548881750f97b3c8712f08ffeda0..1bf4298f54aa544adfba648602104f7e6698d3b6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45c158b1a015e0295244982e7a61ecc55cca8436
\ No newline at end of file
+357231ec970adb5dfcdaf9665499141004cb1198
\ No newline at end of file

diff --git a/src/test_regexp.c b/src/test_regexp.c
index 87fb3db5b32290be3943c87720ac2a885e8dce0e..2fede8c4e54abf418c88e0f9dc022c43c2a2884f 100644 (file)
--- a/src/test_regexp.c
+++ b/src/test_regexp.c
@@ -652,7 +652,7 @@ const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){
       }else if( x<=0xffff ){
         pRe->zInit[j++] = 0xd0 | (x>>12);
         pRe->zInit[j++] = 0x80 | ((x>>6)&0x3f);
-        pRe->zInit[j++] = 0x80 | ((x>>6)&0x3f);
+        pRe->zInit[j++] = 0x80 | (0x3f);
       }else{
         break;
       }