Asserts added that verify that the code works correctly

that ticket #1849 claims is wrong. (CVS 3254)

FossilOrigin-Name: d145dc1c4bce403ec967bfd0024002d4de57f833

diff --git a/manifest b/manifest
index 9143d629e82806df4440eb3fa103241a3e9d10d9..3b10a0afc711271fd38ac9c5aee22588960d0103 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\s(and\smodify\stest\scode)\sfor\swriting\sto\svirtual\stables.\s(CVS\s3253)
-D 2006-06-15T10:41:16
+C Asserts\sadded\sthat\sverify\sthat\sthe\scode\sworks\scorrectly\nthat\sticket\s#1849\sclaims\sis\swrong.\s(CVS\s3254)
+D 2006-06-15T13:22:23
 F Makefile.in 200f6dc376ecfd9b01e5359c4e0c10c02f649b34
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -100,7 +100,7 @@ F src/vdbe.c 4a66e5815c50e7f39454fe75d2e3f342785ea20a
 F src/vdbe.h 258b5d1c0aaa72192f09ff0568ce42b383f156fa
 F src/vdbeInt.h 6ccb7eaae76ebd761470f6a035501ff33aa92c20
 F src/vdbeapi.c 6af0e7160af260052a7a4500464221a03dada75f
-F src/vdbeaux.c de49c1943146ad97538bc2bb0bce7f2c5e5db4f2
+F src/vdbeaux.c 85f2184f536219d3c20c66f1403ef77321d1e715
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
 F src/vtab.c 745148c6f83f7c146ce93cc22c6716ff05a246e2
@@ -366,7 +366,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 88fa510e4c684513bbb59031d034fdb5c51a6a15
-R 9f300784595c0ed5be31e8d13114f756
-U danielk1977
-Z 6d8c84f1329cd866e4eca1550fa6f4bb
+P 6380a9b118cf972c3c7d4886ecdb62c44f2208ca
+R 7c8c83f41ad732828e19404b0580f1d2
+U drh
+Z 7d97f3dfe7f27a791bb719d9b2679d1a

diff --git a/manifest.uuid b/manifest.uuid
index 0f1589e240ca040442fa372ed2daeee0380109f1..e40ade1c3ca02c4b35ab764e7926ec7a12ad19d7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6380a9b118cf972c3c7d4886ecdb62c44f2208ca
\ No newline at end of file
+d145dc1c4bce403ec967bfd0024002d4de57f833
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 0b5743c6f3863e37b88055b01cb1070ed9fdf4b6..13d5cfd7886477b34f60cc87b22fe5d514d112b7 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -590,6 +590,7 @@ static char *displayP3(Op *pOp, char *zTemp, int nTemp){
       }
     }
   }
+  assert( zP3!=0 );
   return zP3;
 }
 #endif
@@ -672,6 +673,7 @@ int sqlite3VdbeList(
 
     pMem->flags = MEM_Static|MEM_Str|MEM_Term;
     pMem->z = sqlite3OpcodeNames[pOp->opcode];  /* Opcode */
+    assert( pMem->z!=0 );
     pMem->n = strlen(pMem->z);
     pMem->type = SQLITE_TEXT;
     pMem->enc = SQLITE_UTF8;
@@ -689,6 +691,7 @@ int sqlite3VdbeList(
 
     pMem->flags = MEM_Ephem|MEM_Str|MEM_Term;   /* P3 */
     pMem->z = displayP3(pOp, pMem->zShort, sizeof(pMem->zShort));
+    assert( pMem->z!=0 );
     pMem->n = strlen(pMem->z);
     pMem->type = SQLITE_TEXT;
     pMem->enc = SQLITE_UTF8;