aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2007-12-12 22:24:12 +0000
committerdrh <drh@noemail.net>2007-12-12 22:24:12 +0000
commit9019f4a65ff613e52e90369fcfe69c7ea24d28f6 (patch)
tree510895f70cfa5069803bae79667111316dc47f71 /src
parentc32a93fe95aa0f0ed8b0b32dafa6eb1afab08128 (diff)
downloadsqlite-9019f4a65ff613e52e90369fcfe69c7ea24d28f6.tar.gz
sqlite-9019f4a65ff613e52e90369fcfe69c7ea24d28f6.zip
Minor cleanup changes on the OP_StackDepth opcode. Added the
sidedelete test for additional testing of ticket #2832. (CVS 4619) FossilOrigin-Name: c0689409320de1532be0c0cae12b4b716f6bffb9
Diffstat (limited to 'src')
-rw-r--r--src/vdbe.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/vdbe.c b/src/vdbe.c
index 88c21219a..e14c558fc 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.658 2007/12/12 12:25:22 drh Exp $
+** $Id: vdbe.c,v 1.659 2007/12/12 22:24:13 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -701,9 +701,10 @@ case OP_Halt: { /* no-push */
** This opcode is used for internal consistency checking.
*/
case OP_StackDepth: { /* no-push */
+ int n = pTos - p->aStack + 1;
if( pOp->p1<0 ){
- pOp->p1 = pTos - p->aStack + 1;
- }else if( pOp->p1!=pTos - p->aStack + 1 ){
+ pOp->p1 = n;
+ }else if( pOp->p1!=n ){
p->pTos = pTos;
p->rc = rc = SQLITE_INTERNAL;
p->pc = pc;