From: drh <drh@noemail.net>
Date: Thu, 17 Mar 2005 03:52:47 +0000 (+0000)
Subject: Strengthen an assert() in vdbe.c. (CVS 2391)
X-Git-Tag: version-3.6.10~3767
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ff55083e5e8cdad84fdbcb772e7db6fabdf274d;p=thirdparty%2Fsqlite.git

Strengthen an assert() in vdbe.c. (CVS 2391)

FossilOrigin-Name: 3f45cf3516be9919fe2c0673d6f445fa83d42126
---

diff --git a/manifest b/manifest
index 7b505697f6..ef446e9ae3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Preparing\sfor\sthe\srelease\sof\s3.1.6.\s(CVS\s2390)
-D 2005-03-17T03:33:17
+C Strengthen\san\sassert()\sin\svdbe.c.\s(CVS\s2391)
+D 2005-03-17T03:52:48
 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -75,7 +75,7 @@ F src/update.c 42823d00865c9fe4f01b3c62647858726345a28e
 F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c
 F src/util.c a53b6fc6f09093ecba1ce593ca7cb1cb77b3a20b
 F src/vacuum.c 5cf598003191bd91c17a64742bad8e46241698a8
-F src/vdbe.c c35e65da4988900724e75b58c55ea04652160976
+F src/vdbe.c 086e4b42d57af68fceb8c04a6e4eed901777d942
 F src/vdbe.h 7e307333d74e134eff237bb9d45fe764e544ad6a
 F src/vdbeInt.h e80721cd8ff611789e20743eec43363a9fb5a48e
 F src/vdbeapi.c 467caa6e6fb9247528b1c7ab9132ae1b4748e8ac
@@ -276,7 +276,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P bf82a04ff7c24a38d45721b3fae69d88d6e83149
-R f724f7249ed7cdc3759dd0a175cfbf23
+P 45cbf27e8079754941225e87867711504bf3d60c
+R ecdf32cee3676fed33ab83ee414d13b7
 U drh
-Z 0957236e05acc13314771530771589ef
+Z ccd5edb340ade1efc64c2c7165bed316
diff --git a/manifest.uuid b/manifest.uuid
index d3c74a1b87..029c7701c6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45cbf27e8079754941225e87867711504bf3d60c
\ No newline at end of file
+3f45cf3516be9919fe2c0673d6f445fa83d42126
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 0b198cea9d..79b6b5438f 100644
--- 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.458 2005/03/17 03:15:40 drh Exp $
+** $Id: vdbe.c,v 1.459 2005/03/17 03:52:48 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -2091,7 +2091,7 @@ case OP_MakeRecord: {
   if( addRowid ){
     zCsr += sqlite3VdbeSerialPut(zCsr, pRowid);
   }
-  assert( zCsr<=(zNewRecord+nByte) );
+  assert( zCsr==(zNewRecord+nByte) );
 
   /* Pop entries off the stack if required. Push the new record on. */
   if( !leaveOnStack ){