Make sure "0" intended as a NULL pointer is cast to a pointer when used

in a varargs functions parameter.

FossilOrigin-Name: ed128e8b826cd9620b7146d01d461ed28b9a672d

diff --git a/manifest b/manifest
index 50d38b0ed61e11af907b5d31e3d88236882f6f29..056d33d3a7d53623c08b8d8c6f0c55f1e21a4385 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\sconditional\sfrom\sthe\sindex\sbuilder.
-D 2016-04-05T14:01:34.379
+C Make\ssure\s"0"\sintended\sas\sa\sNULL\spointer\sis\scast\sto\sa\spointer\swhen\sused\nin\sa\svarargs\sfunctions\sparameter.
+D 2016-04-05T14:02:16.715
 F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
@@ -411,7 +411,7 @@ F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5
 F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202
 F src/test_journal.c 5360fbe1d1e4416ca36290562fd5a2e3f70f32aa
 F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
-F src/test_malloc.c 96df9381a1ff1f6d3805ff7231b9baf1386aaabf
+F src/test_malloc.c 94c18e88d6df6d471a0d04ddb809f833d1739950
 F src/test_multiplex.c 6a9de820fcaaf506c59aa14bc8693822333cea48
 F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3
 F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c
@@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7cacf4e954c8de5af5efb56d8271a5ac1edc1c04
-R 5ad558ecd8aa9ab49f6924d29c53367a
+P 87e5f5a6c60e37e943b3ce80617e81b09852515e
+R a877aa3d312b2b09cc17cdd970ec6cc3
 U drh
-Z 440953881a474ce081fa2537f4e8dbc0
+Z 781d8f18c7a4bdfd2f2083091977b2ca

diff --git a/manifest.uuid b/manifest.uuid
index 43b1d36ebe004c6decddceb10169ec6c93630cc2..ef7f23a7aa5dc22d174ef7982c3ff61178224939 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87e5f5a6c60e37e943b3ce80617e81b09852515e
\ No newline at end of file
+ed128e8b826cd9620b7146d01d461ed28b9a672d
\ No newline at end of file

diff --git a/src/test_malloc.c b/src/test_malloc.c
index aaa640b03a414a5c13aa21dc80ab5471476b8557..e6be6639984a92d675b10314bf6f17fa7892a616 100644 (file)
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -1093,7 +1093,7 @@ static int test_db_config_lookaside(
   if( Tcl_GetIntFromObj(interp, objv[3], &sz) ) return TCL_ERROR;
   if( Tcl_GetIntFromObj(interp, objv[4], &cnt) ) return TCL_ERROR;
   if( bufid==0 ){
-    rc = sqlite3_db_config(db, SQLITE_DBCONFIG_LOOKASIDE, 0, sz, cnt);
+    rc = sqlite3_db_config(db, SQLITE_DBCONFIG_LOOKASIDE, (void*)0, sz, cnt);
   }else if( bufid>=1 && bufid<=2 && sz*cnt<=sizeof(azBuf[0]) ){
     rc = sqlite3_db_config(db, SQLITE_DBCONFIG_LOOKASIDE, azBuf[bufid], sz,cnt);
   }else{