From: drh Date: Tue, 29 Apr 2008 15:38:58 +0000 (+0000) Subject: Zero the per-pager temporary space allocation to avoid warnings from X-Git-Tag: version-3.6.10~1109 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf8a4341f19fc9cfc7271659491c7e984d9ca792;p=thirdparty%2Fsqlite.git Zero the per-pager temporary space allocation to avoid warnings from valgrind. (CVS 5068) FossilOrigin-Name: f854ae576ee0b223b86a1169178fc4399e8d08ce --- diff --git a/manifest b/manifest index 4a3d2e105d..a72690a2e3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\spotential\sbuffer\soverrun\sin\ssqlite3_mprintf()\swhen\sa\snon-terminated\nstring\sis\spassed\sto\sa\s"%s"\sformat\swith\sa\sprecision\sspecifying\sthe\snumber\nof\sbytes\sto\scopy.\s(CVS\s5067) -D 2008-04-29T15:22:27 +C Zero\sthe\sper-pager\stemporary\sspace\sallocation\sto\savoid\swarnings\sfrom\nvalgrind.\s(CVS\s5068) +D 2008-04-29T15:38:59 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -122,7 +122,7 @@ F src/os_common.h e8b748b2f2ecc8a498e50bfe5d8721f189c19d2a F src/os_os2.c 41015b3fa91568761eb10cbf6ca27a0624ba0bda F src/os_unix.c fdec4e5ee5dd555a6ad4a69f38ab35f0788536b4 F src/os_win.c 3a60bddd07ea6f8adb2314dd5996ac97b988f403 -F src/pager.c 2361c00a4cf7936ef7e1463c224214c6fe6ee2cd +F src/pager.c 268be1208002fab9202b3f29b490ba35615a697d F src/pager.h 45ec2188593afd48a25c743529646771d75e83e4 F src/parse.y fc4bd35c6088901f7c8daead26c6fb11c87d22e7 F src/pragma.c 2e4bb2e76e48a32750529fdc4bfe86ac5f54e01b @@ -633,7 +633,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 9b07e59e510e2de39c2081653662fbc654ca6fbb -R 5793178ea6130e42720ac3eacd25bef7 +P 1f5b18419bb4e2552ac26593381e2eb866bb67fd +R 6a7ccfeeb0015916b93125468973211a U drh -Z 662aa440bf0ad4382085d54e6e7f7798 +Z 090b70d1bbb6df5e983e8c84abf88caa diff --git a/manifest.uuid b/manifest.uuid index 0e0f173bae..bf0b6e6c41 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1f5b18419bb4e2552ac26593381e2eb866bb67fd \ No newline at end of file +f854ae576ee0b223b86a1169178fc4399e8d08ce \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index bf7da6c93b..83593d18b6 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.435 2008/04/25 12:25:42 drh Exp $ +** @(#) $Id: pager.c,v 1.436 2008/04/29 15:38:59 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -2256,7 +2256,7 @@ int sqlite3PagerOpen( } if( pPager && rc==SQLITE_OK ){ - pPager->pTmpSpace = (char *)sqlite3_malloc(nDefaultPage); + pPager->pTmpSpace = sqlite3MallocZero(nDefaultPage); } /* If an error occured in either of the blocks above.