Fix segfault due to exception handler being run with uninitialised variable. (CVS...

FossilOrigin-Name: 78df3d040443414ae5b440eeabc0c8c205ab311d

diff --git a/manifest b/manifest
index 898739edae18ecf9f98d887ea183cd9d6f6ead44..25d504bcfa2b19da107f9fdd0715791a077c7c06 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\smemory\sleak\sin\sthe\spager.\s(CVS\s2425)
-D 2005-03-28T18:04:28
+C Fix\ssegfault\sdue\sto\sexception\shandler\sbeing\srun\swith\suninitialised\svariable.\s(CVS\s2426)
+D 2005-03-29T02:54:03
 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -30,7 +30,7 @@ F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
 F src/alter.c 9570af388bc99471ea6e1258817fbf06e3120030
 F src/attach.c 3615dbe960cbee4aa5ea300b8a213dad36527b0f
 F src/auth.c 18c5a0befe20f3a58a41e3ddd78f372faeeefe1f
-F src/btree.c 657fd61dfb4dd37a63416652b1a28700e84b36f7
+F src/btree.c 50f31eb0844ca14614686163f8939b2999272b25
 F src/btree.h 41a71ce027db9ddee72cb43df2316bbe3a1d92af
 F src/build.c 2589c2ffa263406526d0cc5728405c6c2f9638f6
 F src/date.c 2134ef4388256e8247405178df8a61bd60dc180a
@@ -278,7 +278,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P b0409b93108096a81245170887d60d076d639c60
-R 3406a83472c1bef895744682e9f56800
-U drh
-Z 6061a5ba3667967690a9ebc111c561e6
+P 4ca11ca015d798655170593c1b76d312185d6ed2
+R e4c51e3e56b7ef33b113201f3420a8cc
+U danielk1977
+Z 36ddc864efbca1aee674c9701d1319c4

diff --git a/manifest.uuid b/manifest.uuid
index a9a03bc954d10bc9fc1e240aae54eddbd9d17dc6..1e1d2a43ab44857ab1524c1cf05a46032aa3555c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ca11ca015d798655170593c1b76d312185d6ed2
\ No newline at end of file
+78df3d040443414ae5b440eeabc0c8c205ab311d
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 49fe8d9dac80e50e744ea7c8a3eb9872e1adf2a5..87726ae2a3f1c98b31302abf0362e18a13d9c199 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.254 2005/03/28 08:44:07 danielk1977 Exp $
+** $Id: btree.c,v 1.255 2005/03/29 02:54:03 danielk1977 Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -3781,7 +3781,7 @@ static int balance_nonroot(MemPage *pPage){
   u8 *apDiv[NB];               /* Divider cells in pParent */
   int cntNew[NB+2];            /* Index in aCell[] of cell after i-th page */
   int szNew[NB+2];             /* Combined size of cells place on i-th page */
-  u8 **apCell;                 /* All cells begin balanced */
+  u8 **apCell = 0;             /* All cells begin balanced */
   int *szCell;                 /* Local size of all cells in apCell[] */
   u8 *aCopy[NB];               /* Space for holding data of apCopy[] */
   u8 *aSpace;                  /* Space to hold copies of dividers cells */