Fix for ticket #905. (CVS 1995)

FossilOrigin-Name: bf90799d889ccc88ed7e3635b041d5f38865d447

diff --git a/manifest b/manifest
index c3bfc919d4ce41f4af828a3c9259be3af467ad7d..f97affd72950846eafd94e6656cfc4c5462172fb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssegfault\sin\sthe\sauthorizer\swhen\sit\sis\sgiven\sa\sSELECT\sstatement\swith\r\nno\sFROM\sclause.\s\sTicket\s#896.\s(CVS\s1953)
-D 2004-09-09T13:54:30
+C Fix\sfor\sticket\s#905.\s(CVS\s1995)
+D 2004-10-01T15:11:13
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -61,7 +61,7 @@ F src/trigger.c a9927b57c865b6f3df3fb5e40c9824d722660ded
 F src/update.c bd391079138e67d09c9af34528ca4137c29242d1
 F src/util.c 48f1e99803e924433477a7ccbdab35663acb621d
 F src/vacuum.c 36a19aa877c696c4ec8b78300c19f4059d2617a7
-F src/vdbe.c 4b35f2c1a5b3500ac8969ce8655ec2b806284d29
+F src/vdbe.c f78a26f5bbd647fac84c26e0a54b85361613a004
 F src/vdbe.h ac987945e4dd6f987bca534c6005899f089fc270
 F src/vdbeInt.h b40ff02ce39fd076e6ff3369e19c1bbfe1986682
 F src/vdbeaux.c 14ff0eb6ed9d5998f927433c91b0a3d13d81f4f6
@@ -191,7 +191,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P b01d566580b151db0e1c95d124f20ea0bc889250
-R 22bca122a9631c078a0735a63e0339be
+P 205d85d77e8f0c9a1d841129601847235052d59f
+R 79411570fb76b0b7df49c73c1cdb7f3d
 U drh
-Z 7c0af01bb06b95309ddc32f4b16cec60
+Z cc4b046e01ee3e38c16e2284d55425e4

diff --git a/manifest.uuid b/manifest.uuid
index 97d5875e006286ec71f5eb3114125fd0ca830a22..50e157bbb8a942e9b27f6247ad9492e74c8bdee1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-205d85d77e8f0c9a1d841129601847235052d59f
\ No newline at end of file
+bf90799d889ccc88ed7e3635b041d5f38865d447
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index d2cf7a585f27d2e4d6fbd690c55f3681ab5c1f22..e18a30d38ba2858ffca5f57a47797e03d34b0f3f 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.268.2.3 2004/07/19 19:30:50 drh Exp $
+** $Id: vdbe.c,v 1.268.2.4 2004/10/01 15:11:13 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -4545,6 +4545,10 @@ case OP_AggGet: {
     pTos->flags &= ~(MEM_Dyn|MEM_Static|MEM_Short);
     pTos->flags |= MEM_Ephem;
   }
+  if( pTos->flags & MEM_AggCtx ){
+    Release(pTos);
+    pTos->flags = MEM_Null;
+  }
   break;
 }