Add sqlite3BeginBenignMalloc() and EndBenignMalloc() calls to debugging function...

FossilOrigin-Name: 6f857d0e9e0893524c2f828a1a1600fefb6efeff12ecbc9bb1da106a5aff9c1c

diff --git a/manifest b/manifest
index 792bffec3f5a6a78356bc217a0ceb0e8b4a1f6ec..456ff4f533434552b657e73dc535292c27168022 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\scode\sin\ssqlite3expert.c\sto\saccount\sfor\sthe\sfact\sthat\s"--\sTRIGGER\sxyz"\sVM\scomments\sare\snow\somitted\sfor\ssome\sbuilds.
-D 2020-05-15T18:48:31.264
+C Add\ssqlite3BeginBenignMalloc()\sand\sEndBenignMalloc()\scalls\sto\sdebugging\sfunction\ssqlite3VdbePrintOp().
+D 2020-05-16T15:18:27.540
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -609,7 +609,7 @@ F src/vdbe.c e3dba0dee25bc92e871c13cac655260912b3be4abcc85b439259c9934b208da3
 F src/vdbe.h 07b8c636a87df8b6e58f29d6badd7f10d5844353deff1d7c88ed1c2bfe3bbd35
 F src/vdbeInt.h 571413068b5ac07e2ed8ca7a02fa529622fd5455ae6981498376e5e492d2e5ef
 F src/vdbeapi.c e467b75a710ea099f8d2d022abf601d2ccd05e28f63b44b12d93000b6a75f4a8
-F src/vdbeaux.c ee65c810ec97acce013e3024e5b8f3f767459b5d1499a8d379232059eb9aea03
+F src/vdbeaux.c 80626786d21296d9e7936186850343afe5fc6368ad9724a172e151788425a063
 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 F src/vdbemem.c 39b942ecca179f4f30a32b54579a85d74ccaefa5af2a0ad2700abe5ef0768b22
 F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
@@ -1866,7 +1866,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 5e1eb0fa3afd74251bc8f484e3edfa81b15610479431af205bd952c91eecd21f
-R 0e397fa4d97a0dd7081692cb693410ed
+P 7cf93dc55c48c68731a1fe3ae3517fcfeb5c252bfa87e715a333c6194bcc0ace
+R 60cac945dac221a30fe3e7456c780110
 U dan
-Z 81fc3648557f632403998e24e4aa1d05
+Z a51f2ca285cdfd2574eb5f3711aed080

diff --git a/manifest.uuid b/manifest.uuid
index 4581705e3384b5a283103b44d0bc3bfe1b293169..6c6071d1aecdce06c924a021d2182403d7b969e7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7cf93dc55c48c68731a1fe3ae3517fcfeb5c252bfa87e715a333c6194bcc0ace
\ No newline at end of file
+6f857d0e9e0893524c2f828a1a1600fefb6efeff12ecbc9bb1da106a5aff9c1c
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 5be81a35249b4176f0ea8dbaf17f6ff2c4f1cbd7..38dc7cd86950725983be1ab7934f22c3b521d81e 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1836,6 +1836,7 @@ void sqlite3VdbePrintOp(FILE *pOut, int pc, VdbeOp *pOp){
   sqlite3 dummyDb;
   static const char *zFormat1 = "%4d %-13s %4d %4d %4d %-13s %.2X %s\n";
   if( pOut==0 ) pOut = stdout;
+  sqlite3BeginBenignMalloc();
   dummyDb.mallocFailed = 1;
   zP4 = sqlite3VdbeDisplayP4(&dummyDb, pOp);
 #ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
@@ -1854,6 +1855,7 @@ void sqlite3VdbePrintOp(FILE *pOut, int pc, VdbeOp *pOp){
   fflush(pOut);
   sqlite3_free(zP4);
   sqlite3_free(zCom);
+  sqlite3EndBenignMalloc();
 }
 #endif