Fix two problems. Tests now passing.

FossilOrigin-Name: 1c220b806d56e163842e17038c3331f71861bd9c

diff --git a/manifest b/manifest
index 0b02968a4f9a708df137e15e9c11642d38b42457..da62517a335fdb338b22e48e6e11b50c9863334b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_ENABLE_API_ARMOR\scompile-time\soption.\s\sThis\sis\sa\swork\sin\nprogress\sand\sis\snot\syet\scompletely\sfunctional.
-D 2014-10-24T00:35:58.052
+C Fix\stwo\sproblems.\s\sTests\snow\spassing.
+D 2014-10-24T12:37:00.827
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -195,7 +195,7 @@ F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
 F src/main.c 2b882f64580ea72e2d972a5296f9eaa75a353161
-F src/malloc.c 5e02eab3e70cfcc265817f4de008f55e768dca51
+F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@ -224,7 +224,7 @@ F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
 F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
 F src/printf.c c31012ac23e458081df4a32634b60424e0cdfaf3
-F src/random.c 689c95a50b90e7a8b3e6088e33d1d2d4212e6e88
+F src/random.c b8a058131851de1a37801b5587845ee73411c064
 F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 428165951748151e87a15295b7357221433e311b
@@ -1205,10 +1205,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9762ad0639cca2fc1ef0573113fb613ce9e7e83e
-R 98ebc598759882f163c17892cc0d9e3e
-T *branch * api-armor
-T *sym-api-armor *
-T -sym-trunk *
+P c297a84bc678f81ffc0aa9139ab73f0ca87c1971
+R 1cc86c78be65c50602286adf14ad3d43
 U drh
-Z 48418cab28475295c0204ad2ebe00aca
+Z 4a2cbf72bfaa58a272d60444a54fd92d

diff --git a/manifest.uuid b/manifest.uuid
index 64b7efe90b2ba7f54bdc1fea01028b4f9df1276e..0375d856fe735ea5715e840fe7de4617c3b3252f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c297a84bc678f81ffc0aa9139ab73f0ca87c1971
\ No newline at end of file
+1c220b806d56e163842e17038c3331f71861bd9c
\ No newline at end of file

diff --git a/src/malloc.c b/src/malloc.c
index c3c644fd6a4b836e26c9da2aa7d40c5a2e388d29..6fb9d53d1b6c054ca04af84a9d440c0100650aeb 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -475,9 +475,6 @@ sqlite3_uint64 sqlite3_msize(void *p){
 ** Free memory previously obtained from sqlite3Malloc().
 */
 void sqlite3_free(void *p){
-#if defined(SQLITE_ENABLE_API_ARMOR) && !defined(SQLITE_OMIT_AUTOINIT)
-  if( sqlite3_initialize() ) return;
-#endif
   if( p==0 ) return;  /* IMP: R-49053-54554 */
   assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
   assert( sqlite3MemdebugNoType(p, ~MEMTYPE_HEAP) );

diff --git a/src/random.c b/src/random.c
index 7bca0d71af94f084e875b3526998f5975afcc9c9..c4241362de550fe94330d8d48a3ad7d229f970bd 100644 (file)
--- a/src/random.c
+++ b/src/random.c
@@ -37,7 +37,6 @@ void sqlite3_randomness(int N, void *pBuf){
 #ifndef SQLITE_OMIT_AUTOINIT
   if( sqlite3_initialize() ) return;
 #endif
-  if( pBuf==0 || N<=0 ) return;
 
   /* The "wsdPrng" macro will resolve to the pseudo-random number generator
   ** state vector.  If writable static data is unsupported on the target,
@@ -57,6 +56,12 @@ void sqlite3_randomness(int N, void *pBuf){
   sqlite3_mutex_enter(mutex);
 #endif
 
+  if( N<=0 || pBuf==0 ){
+    wsdPrng.isInit = 0;
+    sqlite3_mutex_leave(mutex);
+    return;
+  }
+
   /* Initialize the state of the random number generator once,
   ** the first time this routine is called.  The seed value does
   ** not need to contain a lot of randomness since we are not