From: drh <drh@noemail.net>
Date: Fri, 30 Dec 2016 14:25:42 +0000 (+0000)
Subject: Add a test to ensure that the app-defined pcache xFetch() method is never
X-Git-Tag: version-3.16.0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f4ade0473f2d76361a91120a2c4fe9489feaee8;p=thirdparty%2Fsqlite.git

Add a test to ensure that the app-defined pcache xFetch() method is never
passed a key of zero.

FossilOrigin-Name: 0bdbe49c6d392c4c86a6c01219c9d91d150dea7d
---

diff --git a/manifest b/manifest
index 52cf7abd9c..e1bb7e3206 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\spassing\sNULL\spointers\sto\smemcmp()\sor\smemcpy(),\seven\swhen\sthe\n"number-of-bytes"\sargument\sis\spassed\s0.
-D 2016-12-30T14:15:56.745
+C Add\sa\stest\sto\sensure\sthat\sthe\sapp-defined\spcache\sxFetch()\smethod\sis\snever\npassed\sa\skey\sof\szero.
+D 2016-12-30T14:25:42.274
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -375,7 +375,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 1c7a2b82b290b85b90f9275ae003f688935f70f9
+F src/pager.c 9dc72d23eebbdf992bd69f2ab954d0d3a27c7340
 F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
 F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
 F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
@@ -1540,7 +1540,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 2842bc60538369f888c7df8365858c910322277d
-R 2f360df0a4ed7700031588f42df25e4f
-U dan
-Z 37bb29b03ead205804ed648a38318574
+P 56ff72ab44288296efc99a608f7edc4346366a50
+R e9376a0e6f39c186396a7f16973b7c00
+U drh
+Z a28c5cf75c694c3d54fc5cc0da0c3d0d
diff --git a/manifest.uuid b/manifest.uuid
index 3fe3e58c51..23f172d71f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56ff72ab44288296efc99a608f7edc4346366a50
\ No newline at end of file
+0bdbe49c6d392c4c86a6c01219c9d91d150dea7d
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 073bf35edb..5813b4db47 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -5373,6 +5373,7 @@ static int getPageNormal(
   assert( assert_pager_state(pPager) );
   assert( pPager->hasHeldSharedLock==1 );
 
+  if( pgno==0 ) return SQLITE_CORRUPT_BKPT;
   pBase = sqlite3PcacheFetch(pPager->pPCache, pgno, 3);
   if( pBase==0 ){
     pPg = 0;
@@ -5400,11 +5401,10 @@ static int getPageNormal(
     /* The pager cache has created a new page. Its content needs to 
     ** be initialized. But first some error checks:
     **
-    ** (1) Minimum page number is 1
-    ** (2) The maximum page number is 2^31
-    ** (3) Never try to fetch the locking page
+    ** (1) The maximum page number is 2^31
+    ** (2) Never try to fetch the locking page
     */
-    if( pgno==0 || pgno>PAGER_MAX_PGNO || pgno==PAGER_MJ_PGNO(pPager) ){
+    if( pgno>PAGER_MAX_PGNO || pgno==PAGER_MJ_PGNO(pPager) ){
       rc = SQLITE_CORRUPT_BKPT;
       goto pager_acquire_err;
     }