SQLite

Check-in [e5fff87d00]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix segfault introduced in (3243). (CVS 3245)
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: e5fff87d004ccf0cf8ba1f6afa032f31144527d9
User & Date: danielk1977 2006-06-14 15:14:51.000
Context
2006-06-14
15:16
Add xUpdate method to the echo test module. Currently untested. (CVS 3246) (check-in: 676de55b28 user: danielk1977 tags: trunk)
15:14
Fix segfault introduced in (3243). (CVS 3245) (check-in: e5fff87d00 user: danielk1977 tags: trunk)
15:03
Fix a C++-ism in lempar.c. Ticket #1848. (CVS 3244) (check-in: a0a3b34db8 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/vdbeaux.c.
︙︙
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263

  int doesStatementRollback = 0;
  int hasStatementBegin = 0;
  for(pOp=p->aOp, i=p->nOp-1; i>=0; i--, pOp++){
    u8 opcode = pOp->opcode;

    if( opcode==OP_Function || opcode==OP_AggStep ||
#ifndef SQLITE_OMIT_VIRTUALTABLE
        opcode==OP_VFilter
#endif
    ){
      if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
    }else if( opcode==OP_Halt ){
      if( pOp->p1==SQLITE_CONSTRAINT && pOp->p2==OE_Abort ){
        doesStatementRollback = 1;
      }








|








249
250
251
252
253
254
255
256
257
258
259
260
261
262
263

  int doesStatementRollback = 0;
  int hasStatementBegin = 0;
  for(pOp=p->aOp, i=p->nOp-1; i>=0; i--, pOp++){
    u8 opcode = pOp->opcode;

    if( opcode==OP_Function || opcode==OP_AggStep ||
#ifndef SQLITE_OMIT_VIRTUALTABLE
        opcode==OP_VUpdate
#endif
    ){
      if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
    }else if( opcode==OP_Halt ){
      if( pOp->p1==SQLITE_CONSTRAINT && pOp->p2==OE_Abort ){
        doesStatementRollback = 1;
      }
︙︙