From: dan <dan@noemail.net>
Date: Fri, 8 Mar 2013 18:16:33 +0000 (+0000)
Subject: If SQLITE_OMIT_UTF16 is defined, avoid setting the 'enc' field of Schema objects... 
X-Git-Tag: version-3.7.16~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=994ff6f587c2719281d82670c26464d4ad749aec;p=thirdparty%2Fsqlite.git

If SQLITE_OMIT_UTF16 is defined, avoid setting the 'enc' field of Schema objects to any value except SQLITE_UTF8. Otherwise, assert() statements may fail or spurious SQLITE_NOMEM errors may be returned at the vdbe level later on.

FossilOrigin-Name: f2fecfb2d32cf666e16a87032042dc163ac30250
---

994ff6f587c2719281d82670c26464d4ad749aec
diff --cc manifest
index 7edb73ef7f,10b6635293..ed6e7e5a0f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\schar()\sfunction\sso\sthat\sit\sworks\seven\sif\sSQLITE_OMIT_UTF16\sis\sdefined.
- D 2013-03-07T14:00:04.830
+ C If\sSQLITE_OMIT_UTF16\sis\sdefined,\savoid\ssetting\sthe\s'enc'\sfield\sof\sSchema\sobjects\sto\sany\svalue\sexcept\sSQLITE_UTF8.\sOtherwise,\sassert()\sstatements\smay\sfail\sor\sspurious\sSQLITE_NOMEM\serrors\smay\sbe\sreturned\sat\sthe\svdbe\slevel\slater\son.
 -D 2013-03-08T07:10:37.045
++D 2013-03-08T18:16:33.140
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1037,7 -1037,10 +1037,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
--P e39391422e748407d74853d3de297dc1ea6b991d
- R 822f408c1766b55e00934d75132877ff
- U drh
- Z 4bfedc097a3e5f9aa5da630099d07ac8
 -R 3289616a77804b5f23977ebea41b37fc
 -T *branch * experimental
 -T *sym-experimental *
 -T -sym-trunk *
++P af542c82e8e7f0415530b639fa397429c5f377f6 69746ef787680a4b7590bd1d3c86b229d9d0dac4
++R e97d0ad1e92cdccc17daefa782beb60d
+ U dan
 -Z 244b3a671be0f30c11055ae03af7e004
++Z d719a1d020564eef061f40b2dc07a141
diff --cc manifest.uuid
index 8c5637fab1,24a64f1ae4..9c9264ba66
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- af542c82e8e7f0415530b639fa397429c5f377f6
 -69746ef787680a4b7590bd1d3c86b229d9d0dac4
++f2fecfb2d32cf666e16a87032042dc163ac30250