Make sure an OOM error on sqlite3PagerPagecount() is detected and reported

out to the interface.

FossilOrigin-Name: 8aecf302a5aac66e43a8cc6c4e0d917f74e9e0de

diff --git a/manifest b/manifest
index 20b74f372aa7eb1ff504ebdfcfee08789dfc40c3..57a1433a5e2b39edb1e495d2366182aa55bee76c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Report\scorruption\sif\sa\sdatabase\scontains\sa\sreference\sthat\sis\sout\sof\srange\naccording\sto\sthe\sfilesize-in-header\sdatabase\ssize.
-D 2010-03-31T20:29:07
+C Make\ssure\san\sOOM\serror\son\ssqlite3PagerPagecount()\sis\sdetected\sand\sreported\nout\sto\sthe\sinterface.
+D 2010-03-31T23:20:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -155,7 +155,7 @@ F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
 F src/os_unix.c 148d2f625db3727250c0b880481ae7630b6d0eb0
 F src/os_win.c 1c7453c2df4dab26d90ff6f91272aea18bcf7053
-F src/pager.c d9f426234c8fe92f3ce57126e14766a654a20690
+F src/pager.c 600058c0cda55fc3d6e3adc6ac97e1935d15cd01
 F src/pager.h ef8a2cf10084f60ab45ee2dfded8bf8b0c655ddf
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf
@@ -797,14 +797,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 06b9ca32255572a699dc51f46f848d0bf01255e1
-R 7d8684b73c602c2980a1877629272610
+P a91db0b1cd0b0fbadc5c8fe2eb8863629b411d87
+R d0cfacaf286f70607c801b2627e3ae09
 U drh
-Z 019388e72c1d6fcd99563b309203809e
+Z c3eaed996d3d32543d54fe382e9d282d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLs7CWoxKgR168RlERAo7kAJ9xfXtlWiJg/NoBVHXelNJHhEKNoQCff5FN
-VAKy4m4ZJBO8z9GemyuG8jU=
-=aexS
+iD8DBQFLs9ipoxKgR168RlERAoJtAJ0e7fA4jGclTUv0A6kz2i9Ci2nJlwCferWu
+1xFYT/N/pXTWZeYe5uezcH0=
+=FDGP
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 2a374bda5ccb9626f98db7aece7113b556a4c84b..123704951ad4c3db55f3e2020fbb8815ef4c7248 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a91db0b1cd0b0fbadc5c8fe2eb8863629b411d87
\ No newline at end of file
+8aecf302a5aac66e43a8cc6c4e0d917f74e9e0de
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index f6f2c5b1238fd90c2dc63a0a6f1dd34161db8c6a..51db8c7930dad4545e8b1d1da13feb7d4ea10c64 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -4006,7 +4006,8 @@ static int pager_open_journal(Pager *pPager){
   if( NEVER(pPager->errCode) ) return pPager->errCode;
 
   testcase( pPager->dbSizeValid==0 );
-  sqlite3PagerPagecount(pPager, &nPage);
+  rc = sqlite3PagerPagecount(pPager, &nPage);
+  if( rc ) return rc;
   pPager->pInJournal = sqlite3BitvecCreate(nPage);
   if( pPager->pInJournal==0 ){
     return SQLITE_NOMEM;