Add a pair of sqlite3FaultSim(100) calls to vdbesort.c to facilitate testing

of obscure and hard to reach error conditions.

FossilOrigin-Name: cceac14fd83ddd8f868c1767cdc66635607cb159

diff --git a/manifest b/manifest
index 008a8c89ecf84dee208079849c12461b637f196d..963e9310beebd22b34aaba8d1dc69ed0a7cf8232 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sall\srecent\schanges\sfrom\strunk,\sand\sespecially\sthe\snew\ssqlite3FaultSim()\ninterface.
-D 2014-05-16T14:27:05.717
+C Add\sa\spair\sof\ssqlite3FaultSim(100)\scalls\sto\svdbesort.c\sto\sfacilitate\stesting\nof\sobscure\sand\shard\sto\sreach\serror\sconditions.
+D 2014-05-16T17:31:42.435
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de92112472618cb869d27249966bad1783e4a853
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c 44d4d1f5711f71eaf0d624de5c3e4976fe4e180b
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
-F src/vdbesort.c 7946115f7c3e0d6156121d5e39512e3e980da134
+F src/vdbesort.c f126a837c4bea832f3b91796081131b22d7b9c7e
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -1175,7 +1175,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 88cfe6d7de5f19f484304d0db585eac5de6c00ae 0d43a7ad9abe821e33e0bf83a997aa4461b1e3f2
-R ab0eda2a23c6a8769439757acdbfc7f8
+P 43fcbd9116401f30781fdcbe55d1674d6b96311b
+R 2be9e504fbe8e48aafd8e17341d9b966
 U drh
-Z b6ed5f464b035536d72301437f5c1385
+Z 9396ea859eaf958c2b1d37dca9017593

diff --git a/manifest.uuid b/manifest.uuid
index 48bb400eb1ae83749a3147a461a2573c9cd58362..5102b5e8a8912197b902d9473bef5f0883003b98 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-43fcbd9116401f30781fdcbe55d1674d6b96311b
\ No newline at end of file
+cceac14fd83ddd8f868c1767cdc66635607cb159
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index 3bd19e1c36f31f7a866fab7b4a23bf18946866ed..7c844065b472a4cad0c9ab379ffc37781ff6aacb 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -1032,7 +1032,7 @@ static MergeEngine *vdbeMergeEngineNew(int nIter){
   while( N<nIter ) N += N;
   nByte = sizeof(MergeEngine) + N * (sizeof(int) + sizeof(PmaReader));
 
-  pNew = (MergeEngine*)sqlite3MallocZero(nByte);
+  pNew = sqlite3FaultSim(100) ? 0 : (MergeEngine*)sqlite3MallocZero(nByte);
   if( pNew ){
     pNew->nTree = N;
     pNew->aIter = (PmaReader*)&pNew[1];
@@ -1807,7 +1807,8 @@ static int vdbeIncrNew(
   IncrMerger **ppOut
 ){
   int rc = SQLITE_OK;
-  IncrMerger *pIncr = *ppOut = (IncrMerger*)sqlite3MallocZero(sizeof(*pIncr));
+  IncrMerger *pIncr = *ppOut = (IncrMerger*)
+       (sqlite3FaultSim(100) ? 0 : sqlite3MallocZero(sizeof(*pIncr)));
   if( pIncr ){
     pIncr->pMerger = pMerger;
     pIncr->pTask = pTask;