From: drh Date: Tue, 13 Apr 2010 15:30:53 +0000 (+0000) Subject: Fix an uninitialized variable in readDbPage of pager.c. X-Git-Tag: version-3.7.2~455^2~86 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=622194c0d205e4391d92afa68bff8c0687b80f33;p=thirdparty%2Fsqlite.git Fix an uninitialized variable in readDbPage of pager.c. FossilOrigin-Name: f4e1150fed2c520c7c52612cb1019429d78dc32a --- diff --git a/manifest b/manifest index 170cf0e546..8eff149f3c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,8 @@ -C Remove\sold\scode\sto\sinterpret\san\sargument\s(no\slonger\sused)\sto\s"PRAGMA\scheckpoint". -D 2010-04-13T11:56:04 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Fix\san\suninitialized\svariable\sin\sreadDbPage\sof\spager.c. +D 2010-04-13T15:30:53 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -154,7 +157,7 @@ F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f F src/os_unix.c 5bf0015cebe2f21635da2af983c348eb88b3b4c1 F src/os_win.c 1c7453c2df4dab26d90ff6f91272aea18bcf7053 -F src/pager.c 88cbb683c96080bf2ecff2b355da10d567a0353f +F src/pager.c c4937e7175f0aa66b9122d05cc163c039f854855 F src/pager.h ce5d076f3860a5f2d7460c582cd68383343b33cf F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf @@ -803,7 +806,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P dcb31181db246dd3f81ce63b144dd0cf95f06ee3 -R 6f02a41d259c74c25289be520ca51251 -U dan -Z 68876c4a3171b03c883dda51dc5e0740 +P 27dc5977c19e717afd65d3805557e38dec7bedcb +R ca7988a67487ccd526ae5248710a4503 +U drh +Z c2421237a2b7de8b8aa2d4d5608541bc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFLxI4woxKgR168RlERAp8sAJ9x+oJYnqOMgUNsC198WiuQpy6qyQCfcaVa +jjZp98/Y+EUb/i8plNNLbiM= +=2Ctn +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 31c9695615..95954aef22 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -27dc5977c19e717afd65d3805557e38dec7bedcb \ No newline at end of file +f4e1150fed2c520c7c52612cb1019429d78dc32a \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index ff696c64e7..4e8213cf9b 100644 --- a/src/pager.c +++ b/src/pager.c @@ -2188,7 +2188,7 @@ end_playback: static int readDbPage(PgHdr *pPg){ Pager *pPager = pPg->pPager; /* Pager object associated with page pPg */ Pgno pgno = pPg->pgno; /* Page number to read */ - int rc; /* Return code */ + int rc = SQLITE_OK; /* Return code */ i64 iOffset; /* Byte offset of file to read from */ int isInLog = 0; /* True if page is in log file */