From: mistachkin <mistachkin@noemail.net>
Date: Sat, 17 Sep 2011 15:34:50 +0000 (+0000)
Subject: Make sure the file structure is zeroed prior to calling the VFS to open a file.
X-Git-Tag: version-3.7.8~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1c40f4fd4e2069bd4ca63cdb1f072dae6b1a438;p=thirdparty%2Fsqlite.git

Make sure the file structure is zeroed prior to calling the VFS to open a file.

FossilOrigin-Name: 29c4d0dd43d41650e54824afd70dd40f1b91cc86
---

diff --git a/manifest b/manifest
index 06663a9554..a4dc13a816 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sSQLITE_OMIT_TRACE\sthat\swas\sintroduced\sby\sthe\srecent\nOP_Once\schange.
-D 2011-09-16T22:10:57.198
+C Make\ssure\sthe\sfile\sstructure\sis\szeroed\sprior\sto\scalling\sthe\sVFS\sto\sopen\sa\sfile.
+D 2011-09-17T15:34:50.929
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -161,7 +161,7 @@ F src/mutex_os2.c 882d735098c07c8c6a5472b8dd66e19675fe117f
 F src/mutex_unix.c b4f4e923bb8de93ec3f251fadb50855f23df9579
 F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
-F src/os.c fcc717427a80b2ed225373f07b642dc1aad7490b
+F src/os.c 3b3f69c34be7f998f5ea6bd46a2fe8a2b7fa8f70
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
@@ -962,7 +962,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 2e66e41457422449ac5918b16be443e737dfb149
-R fc961be987415e6cdb50c0924196d190
-U drh
-Z a161e546ae0e6f16b9b8fc71b39898c3
+P 96be3f7b59b3ed4703b907e29db629df34b2b56f
+R 77ce1bce7b62d392fc7c2060d8f391e0
+U mistachkin
+Z b6b2d3e2f1bcf3c98cc7b58c3993322a
diff --git a/manifest.uuid b/manifest.uuid
index b33cedd522..427a563b6b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-96be3f7b59b3ed4703b907e29db629df34b2b56f
\ No newline at end of file
+29c4d0dd43d41650e54824afd70dd40f1b91cc86
\ No newline at end of file
diff --git a/src/os.c b/src/os.c
index 41ec69ce45..9ca72fa31f 100644
--- a/src/os.c
+++ b/src/os.c
@@ -208,7 +208,7 @@ int sqlite3OsOpenMalloc(
 ){
   int rc = SQLITE_NOMEM;
   sqlite3_file *pFile;
-  pFile = (sqlite3_file *)sqlite3Malloc(pVfs->szOsFile);
+  pFile = (sqlite3_file *)sqlite3MallocZero(pVfs->szOsFile);
   if( pFile ){
     rc = sqlite3OsOpen(pVfs, zFile, pFile, flags, pOutFlags);
     if( rc!=SQLITE_OK ){