From: dan <dan@noemail.net>
Date: Fri, 2 Sep 2016 21:34:17 +0000 (+0000)
Subject: Add a test case for the OOM handled by the previous commit.
X-Git-Tag: version-3.15.0~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6952addf7c2c22c7345d5ae8564ab762a1bdb1b;p=thirdparty%2Fsqlite.git

Add a test case for the OOM handled by the previous commit.

FossilOrigin-Name: 9bdf7ca1b317fe0ba7efea38fb395bf6130ac89a
---

diff --git a/manifest b/manifest
index 4b8ebb6ca8..c643135037 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correctly\sdetect\san\sOOM\soccurring\sin\sthe\ssetDestPgsz()\ssubroutine\sof\nbackup.
-D 2016-09-02T21:17:51.499
+C Add\sa\stest\scase\sfor\sthe\sOOM\shandled\sby\sthe\sprevious\scommit.
+D 2016-09-02T21:34:17.199
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -524,7 +524,7 @@ F test/backup2.test 34986ef926ea522911a51dfdb2f8e99b7b75ebcf
 F test/backup4.test 8f6fd48e0dfde77b9a3bb26dc471ede3e101df32
 F test/backup5.test ee5da6d7fe5082f5b9b0bbfa31d016f52412a2e4
 F test/backup_ioerr.test 4c3c7147cee85b024ecf6e150e090c32fdbb5135
-F test/backup_malloc.test 7162d604ec2b4683c4b3799a48657fb8b5e2d450
+F test/backup_malloc.test 833d1b90561a6dbab00079b9591bd4fc90b7c2e1
 F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
 F test/badutf2.test f5bc7f2d280670ecd79b9cf4f0f1760c607fe51f
 F test/bc_common.tcl b5e42d80305be95697e6370e015af571e5333a1c
@@ -1511,7 +1511,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 7908fc604991d81140c182b97981fd724ad126ae
-R 927ab162f03d57784d15e59a76583f84
-U drh
-Z 3a29e1d29c21b4d8169c8797b79e666a
+P d9d8a048d4b621435870b4f8dd13b2938ac2f8fd
+R b03bceee349e62c9e4b232e967e75375
+U dan
+Z 94198719997091b0b262fcfd62b5468a
diff --git a/manifest.uuid b/manifest.uuid
index a3366a05c1..33cb4d6b33 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d9d8a048d4b621435870b4f8dd13b2938ac2f8fd
\ No newline at end of file
+9bdf7ca1b317fe0ba7efea38fb395bf6130ac89a
\ No newline at end of file
diff --git a/test/backup_malloc.test b/test/backup_malloc.test
index f556861fb1..45cac44f18 100644
--- a/test/backup_malloc.test
+++ b/test/backup_malloc.test
@@ -84,4 +84,35 @@ do_malloc_test backup_malloc-2 -tclprep {
   db2 close
 }
 
+reset_db
+do_execsql_test 3.0 {
+  PRAGMA page_size = 16384;
+  BEGIN;
+  CREATE TABLE t1(a, b);
+  INSERT INTO t1 VALUES(1, 2);
+  COMMIT;
+}
+
+do_faultsim_test 3 -faults oom* -prep {
+  catch { db close }
+
+  forcedelete test2.db
+  sqlite3 db2 test2.db
+  sqlite3 db test.db
+  sqlite3_backup B db2 main db main
+} -body {
+
+  set rc [B step 50]
+  if {$rc == "SQLITE_NOMEM" || $rc == "SQLITE_IOERR_NOMEM"} {
+    error "out of memory"
+  }
+
+} -test {
+  faultsim_test_result {0 {}} 
+  faultsim_integrity_check
+  
+  # Finalize the backup.
+  catch { B finish }
+}
+
 finish_test