Make sure the function context is fully initialized before invoking the

function finalizer.  Ticket #3326. (CVS 5596)

FossilOrigin-Name: 8496f4a00a7e62006956e58f3d50c6c4de5347e4

diff --git a/manifest b/manifest
index 300af0e1341dd8b76b78c466433bf01f9618afc4..70d7356f2dbef8cee2e231374789423266c5b1b5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunused\svariable\sfrom\sprintf.c.\s\sTicket\s#3331.\s(CVS\s5595)
-D 2008-08-22T14:08:36
+C Make\ssure\sthe\sfunction\scontext\sis\sfully\sinitialized\sbefore\sinvoking\sthe\nfunction\sfinalizer.\s\sTicket\s#3326.\s(CVS\s5596)
+D 2008-08-22T14:41:01
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 51b727303f84cf055e29514d8248e5eaf9701379
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -193,7 +193,7 @@ F src/vdbeapi.c 3c98fbed9d4e10a4fbe09fce47e88ec567927a7b
 F src/vdbeaux.c 45a53a4459c01db4e6befc977952346bfef405c3
 F src/vdbeblob.c f93110888ddc246215e9ba1f831d3d375bfd8355
 F src/vdbefifo.c 20fda2a7c4c0bcee1b90eb7e545fefcdbf2e1de7
-F src/vdbemem.c c37b2a266a49eaf0c0f5080157f9f1a908fdaac3
+F src/vdbemem.c 51538ff193e1fcd462123ccef65323ccd2cc030c
 F src/vtab.c 527c180e9c5fca417c9167d02af4b5039f892b4b
 F src/walker.c 488c2660e13224ff70c0c82761118efb547f8f0d
 F src/where.c b156f2785538ed1783dbdd1f714d00ba21c1d5b1
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P b688c68c3d70dc69adc2d1a08ddcf5899a115646
-R b1823fb06c594bd3d36602634950ace1
+P 7fd11f4ad8774e68f0a053eb2e1dd962a024da48
+R d422b5970a3ab5d1313431fc076c62e8
 U drh
-Z d5d85a25fc7e66c54a54c4e7b5d02861
+Z dc8b2c3e5eaef00fc8cce9d4dcda1b42

diff --git a/manifest.uuid b/manifest.uuid
index 4b4cbe7c6763f06b2afd07a977f29daea506ebb5..ed5ed203580047a071381dcb3f26d62aa74581f6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7fd11f4ad8774e68f0a053eb2e1dd962a024da48
\ No newline at end of file
+8496f4a00a7e62006956e58f3d50c6c4de5347e4
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 8b94e3e4a552f02fe596f50626046bcb66934d0c..1bf8aa0c6919394f23e4ee37d610d6ebd78130d0 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -15,7 +15,7 @@
 ** only within the VDBE.  Interface routines refer to a Mem using the
 ** name sqlite_value
 **
-** $Id: vdbemem.c,v 1.121 2008/08/01 20:10:09 drh Exp $
+** $Id: vdbemem.c,v 1.122 2008/08/22 14:41:01 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -240,12 +240,11 @@ int sqlite3VdbeMemFinalize(Mem *pMem, FuncDef *pFunc){
     sqlite3_context ctx;
     assert( (pMem->flags & MEM_Null)!=0 || pFunc==pMem->u.pDef );
     assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+    memset(&ctx, 0, sizeof(ctx));
     ctx.s.flags = MEM_Null;
     ctx.s.db = pMem->db;
-    ctx.s.zMalloc = 0;
     ctx.pMem = pMem;
     ctx.pFunc = pFunc;
-    ctx.isError = 0;
     pFunc->xFinalize(&ctx);
     assert( 0==(pMem->flags&MEM_Dyn) && !pMem->xDel );
     sqlite3DbFree(pMem->db, pMem->zMalloc);