Fix an uninitialized variable introduced by check-in (1202). (CVS 1235)

FossilOrigin-Name: 9f149fdc1c6af1c663b91c878ed1903f82f80245

diff --git a/manifest b/manifest
index 4481d093eb504f72eabcfc7e6af301d5c17b6092..b376e03d6951aebb12edf4ad172855086c1e0d06 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\snew\sparameter\sto\sthe\s(unimplemented)\sencryption\sAPI.\s(CVS\s1234)
-D 2004-02-12T20:49:36
+C Fix\san\suninitialized\svariable\sintroduced\sby\scheck-in\s(1202).\s(CVS\s1235)
+D 2004-02-13T14:07:13
 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -61,7 +61,7 @@ F src/trigger.c ce83e017b407d046e909d05373d7f8ee70f9f7f9
 F src/update.c 24260b4fda00c9726d27699a0561d53c0dccc397
 F src/util.c 64995b5949a5d377629ffd2598747bc771cade1e
 F src/vacuum.c d9e80c2b36ee1f623dbf1bdf3cedad24a23f87ac
-F src/vdbe.c f665f4c1dcee0665f26b88b9e7ede74c4ab9edd5
+F src/vdbe.c 13df29e02f8015505a6ed31cd6b098932f5da07f
 F src/vdbe.h 3957844e46fea71fd030e78f6a3bd2f7e320fb43
 F src/vdbeInt.h 8a3baf749115cba81a810b7a52208aef055eda7b
 F src/vdbeaux.c c55d87d6658487e87ef09ca80c1aa2f314024fed
@@ -184,7 +184,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 0c77cee70f078152969933c1d340cea1c86286b0
-R 4be60c410d6a1f5809447c3d05e4f8c5
+P 5fe8f02306cf1c0af2148835cee0df3003ad0874
+R 37f801315d07f57c3a703640bb77ce36
 U drh
-Z f3af3c80152ef34879d7dc074d7d117b
+Z 05d7354095b873584dabb1ae129be199

diff --git a/manifest.uuid b/manifest.uuid
index ed60521af3de553b10b902fadfff647951eb426f..22137f05ec7c7ed547c4538e6033172467f77376 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5fe8f02306cf1c0af2148835cee0df3003ad0874
\ No newline at end of file
+9f149fdc1c6af1c663b91c878ed1903f82f80245
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 0a2ae1ba46c18667cc0fe5d219e258c37ce10e5c..ec2172af0185702e10552f64f0b580877eed09ef 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.260 2004/02/12 13:02:56 drh Exp $
+** $Id: vdbe.c,v 1.261 2004/02/13 14:07:13 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -2970,6 +2970,12 @@ case OP_PutStrKey: {
         pC->nextRowidValid = 0;
       }
     }
+    if( pTos->flags & MEM_Null ){
+      pTos->z = 0;
+      pTos->n = 0;
+    }else{
+      assert( pTos->flags & MEM_Str );
+    }
     if( pC->pseudoTable ){
       /* PutStrKey does not work for pseudo-tables.
       ** The following assert makes sure we are not trying to use