diff options
| author | stephan <stephan@noemail.net> | 2022-09-06 09:59:06 +0000 |
|---|---|---|
| committer | stephan <stephan@noemail.net> | 2022-09-06 09:59:06 +0000 |
| commit | ae1ed83831d9cb6026a15d30d43a309bf3fd758f (patch) | |
| tree | a8a255cd018524d40505172732ae7f0a8a92f930 /src/vdbeaux.c | |
| parent | 49cb8d7314f201bcc264ab3c38c01ae48822a7a4 (diff) | |
| parent | 2e440a0801ad366d48532890b506853c0e34030e (diff) | |
| download | sqlite-ae1ed83831d9cb6026a15d30d43a309bf3fd758f.tar.gz sqlite-ae1ed83831d9cb6026a15d30d43a309bf3fd758f.zip | |
Merge trunk into fiddle-opfs branch.
FossilOrigin-Name: 7f76eaec793720db87415a476ddf539bc4dea3e74c8e5406d6739206aebdacc2
Diffstat (limited to 'src/vdbeaux.c')
| -rw-r--r-- | src/vdbeaux.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vdbeaux.c b/src/vdbeaux.c index a4b4516c0..8785e3b56 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -388,6 +388,7 @@ int sqlite3VdbeAddFunctionCall( addr = sqlite3VdbeAddOp4(v, eCallCtx ? OP_PureFunc : OP_Function, p1, p2, p3, (char*)pCtx, P4_FUNCCTX); sqlite3VdbeChangeP5(v, eCallCtx & NC_SelfRef); + sqlite3MayAbort(pParse); return addr; } @@ -723,6 +724,7 @@ int sqlite3VdbeAssertMayAbort(Vdbe *v, int mayAbort){ || opcode==OP_VDestroy || opcode==OP_VCreate || opcode==OP_ParseSchema + || opcode==OP_Function || opcode==OP_PureFunc || ((opcode==OP_Halt || opcode==OP_HaltIfNull) && ((pOp->p1)!=SQLITE_OK && pOp->p2==OE_Abort)) ){ |