diff options
| author | dan <dan@noemail.net> | 2015-03-24 18:21:41 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-03-24 18:21:41 +0000 |
| commit | 6da7a0a93da31b48081f50e92d4e7b5ffe19522d (patch) | |
| tree | 3e9128ad52de6f69aa11508109f8eb28d1bb2309 /src/func.c | |
| parent | f37120a416aee4703f5305e68c7535927678cc87 (diff) | |
| parent | 126e9e6347216e47b538e4e8f24cfc2d752d89b3 (diff) | |
| download | sqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.tar.gz sqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.zip | |
Merge the latest trunk changes into this branch.
FossilOrigin-Name: 9d9b6c883b4f7d69c615cedfb59a2385aac47b74
Diffstat (limited to 'src/func.c')
| -rw-r--r-- | src/func.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/func.c b/src/func.c index d917bdbec..782a24088 100644 --- a/src/func.c +++ b/src/func.c @@ -22,7 +22,9 @@ ** Return the collating function associated with a function. */ static CollSeq *sqlite3GetFuncCollSeq(sqlite3_context *context){ - VdbeOp *pOp = &context->pVdbe->aOp[context->iOp-1]; + VdbeOp *pOp; + assert( context->pVdbe!=0 ); + pOp = &context->pVdbe->aOp[context->iOp-1]; assert( pOp->opcode==OP_CollSeq ); assert( pOp->p4type==P4_COLLSEQ ); return pOp->p4.pColl; |