From: danielk1977 Date: Tue, 1 Feb 2005 03:09:52 +0000 (+0000) Subject: Avoid allocating a vdbe in sqlite3FinishCoding() if one has not been allocated alread... X-Git-Tag: version-3.6.10~3853 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48d0d866fcf25993b8d8edbcbdbf531a6a7b4c98;p=thirdparty%2Fsqlite.git Avoid allocating a vdbe in sqlite3FinishCoding() if one has not been allocated already. (CVS 2299) FossilOrigin-Name: eaf1866e4d10f0ddf5ccc02b7d9aff281ff9efc0 --- diff --git a/manifest b/manifest index ceb99b8a90..01119c19bc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sto\ssqlite3AffinityType()\sto\sremove\shex\sconstants.\s(CVS\s2298) -D 2005-02-01T02:13:29 +C Avoid\sallocating\sa\svdbe\sin\ssqlite3FinishCoding()\sif\sone\shas\snot\sbeen\sallocated\salready.\s(CVS\s2299) +D 2005-02-01T03:09:52 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1 @@ -31,7 +31,7 @@ F src/attach.c f78f76bc6a8e5e487ca53636e21ccba2484a9a61 F src/auth.c 18c5a0befe20f3a58a41e3ddd78f372faeeefe1f F src/btree.c e68ae12c8b12ef9d45d58d931c36c184055a3880 F src/btree.h 74d19cf40ab49fd69abe9e4e12a6c321ad86c497 -F src/build.c 321c80debeee58019808ff9486aed879e18f9d79 +F src/build.c 7b9427a2f9fccde0a4f543dd7ef6966ac005df78 F src/cursor.c de73c00aefc4747ad59b5105cf38bbff0667922e F src/date.c f3d1f5cd1503dabf426a198f3ebef5afbc122a7f F src/delete.c 4b94395b52a8f7785acd71135c2ce54f3f5550b3 @@ -272,7 +272,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd -P 4eca6c05abdf3955c5fd7bd3a22c87cd4741d656 -R dccd9fc3b4d1260c30825cd7dc43a46d +P d8b4b0ef13dddbf527e7440e7343c458210dceac +R 32c1bba6ed63992275398bb8bbb11ed7 U danielk1977 -Z edba349b2f77946ee84b1132004c3dd3 +Z dc111654e2377c88987b45c4a82d2550 diff --git a/manifest.uuid b/manifest.uuid index 831d98941d..2e870af7e3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d8b4b0ef13dddbf527e7440e7343c458210dceac \ No newline at end of file +eaf1866e4d10f0ddf5ccc02b7d9aff281ff9efc0 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 147f5f0904..45367903cf 100644 --- a/src/build.c +++ b/src/build.c @@ -22,7 +22,7 @@ ** COMMIT ** ROLLBACK ** -** $Id: build.c,v 1.306 2005/02/01 02:13:29 danielk1977 Exp $ +** $Id: build.c,v 1.307 2005/02/01 03:09:52 danielk1977 Exp $ */ #include "sqliteInt.h" #include @@ -53,6 +53,8 @@ void sqlite3FinishCoding(Parse *pParse){ if( sqlite3_malloc_failed ) return; if( pParse->nested ) return; + if( !pParse->pVdbe ) return; + /* Begin by generating some termination code at the end of the ** vdbe program */