Fully initialize the Mem object for serial-type 10, in case such a

serial-type is found in a corrupt database file.

FossilOrigin-Name: bd70a07d819a54346cb6c40fab681424c5af0dfb6bf29321a3de9fc99d285376

diff --git a/manifest b/manifest
index 043e201dd1be3e7da705e10e1da10e8a02a39afa..8cef8f94b40a89abafea830339d69a1cd30d017f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\svarious\sproblems\sin\stest\sscripts\spreventing\s"make\stest"\sfrom\spassing\son\nF2FS\sfile-systems\swith\sthe\s"atomic-write"\sfeature.
-D 2018-01-13T14:02:16.056
+C Fully\sinitialize\sthe\sMem\sobject\sfor\sserial-type\s10,\sin\scase\ssuch\sa\nserial-type\sis\sfound\sin\sa\scorrupt\sdatabase\sfile.
+D 2018-01-13T14:28:00.767
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
@@ -558,7 +558,7 @@ F src/vdbe.c ccc1e17a30325068ae4f0292e8601997946886d23acc989c68f2a261a2795c70
 F src/vdbe.h 134beb7a12a6213c00eba58febaede33447cc4441bc568a0d9c144b33fc3720a
 F src/vdbeInt.h 5442fc816b6cf19c8801724199fd6b77a02eb31a7a174021713f8c59b30e51fa
 F src/vdbeapi.c 02f773681d06e46454b0606339068d4d4490873dc4a7334bc0c6030552bb2c8c
-F src/vdbeaux.c fc124962c9900b19d201e57084a4302d07136a77f51fdbdfabd625a3ca3b6dc1
+F src/vdbeaux.c 2756ac68ac259c416554100598fc291870063288cd7e1af22847f57b3e130e56
 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
 F src/vdbemem.c 7548dd5af03d24d534a5dbc41e3bbdf1fab83e9c8856a8d2549ed2ccf33d0e80
 F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
@@ -1699,8 +1699,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 bb196fcb677e962db4308c02097968615729a51fe4a1292e468aaf3e4bf522d3 c3dc7b8d9de94e46fae75fcc96ec68743205e0a2591e14391c394fff203004d1
-R 095d7894b995bcb80e7e3cee4fddb19c
-T +closed c3dc7b8d9de94e46fae75fcc96ec68743205e0a2591e14391c394fff203004d1
-U dan
-Z 11c45edcc4119d583f229c1e527d94cf
+P 6bedc7435d26c1f21c0d1b3a52daa0169fa5416b690a99347328dcafdcd78740
+R a7ff4a80a5a33de73167133f07814a11
+U drh
+Z 940a381e739a90351c545fb8067ae8cb

diff --git a/manifest.uuid b/manifest.uuid
index 065366082a69406fa8286c42ac84da1338fd4287..b60772254fe2f2f0703308c4459d0341498b9dee 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6bedc7435d26c1f21c0d1b3a52daa0169fa5416b690a99347328dcafdcd78740
\ No newline at end of file
+bd70a07d819a54346cb6c40fab681424c5af0dfb6bf29321a3de9fc99d285376
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 72a5b96bba6877513928738a0352226cafd0e580..78777bd5a63c37b16f59a6e97ea31496ac801c41 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3457,6 +3457,8 @@ u32 sqlite3VdbeSerialGet(
     case 10: { /* Internal use only: NULL with virtual table
                ** UPDATE no-change flag set */
       pMem->flags = MEM_Null|MEM_Zero;
+      pMem->n = 0;
+      pMem->u.nZero = 0;
       break;
     }
     case 11:   /* Reserved for future use */