diff options
| author | drh <drh@noemail.net> | 2020-01-09 20:44:37 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-01-09 20:44:37 +0000 |
| commit | bebce86cde221fdaaf084d296ab811af1e5a3cf2 (patch) | |
| tree | 14fce64f57bc80fffa399ae283d980e06ea91a27 /ext/misc/fossildelta.c | |
| parent | 32d184e049b5a30d39b01be1b310c563ae716d23 (diff) | |
| parent | b84fda37efdd612288c1bc4933fa3ae6bcc2ffbc (diff) | |
| download | sqlite-bebce86cde221fdaaf084d296ab811af1e5a3cf2.tar.gz sqlite-bebce86cde221fdaaf084d296ab811af1e5a3cf2.zip | |
Merge in the untrusted-schema enhancements.
See [/doc/87aea3ab1cdda453/doc/trusted-schema.md|doc/trusted-schema.md]
for details.
FossilOrigin-Name: 5720924cb07766cd54fb042da58f4b4acf12b60029fba86a23a606ad0d0f7c68
Diffstat (limited to 'ext/misc/fossildelta.c')
| -rw-r--r-- | ext/misc/fossildelta.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/misc/fossildelta.c b/ext/misc/fossildelta.c index d5f62a8d2..78c2be301 100644 --- a/ext/misc/fossildelta.c +++ b/ext/misc/fossildelta.c @@ -822,6 +822,7 @@ static int deltaparsevtabConnect( *ppVtab = (sqlite3_vtab*)pNew; if( pNew==0 ) return SQLITE_NOMEM; memset(pNew, 0, sizeof(*pNew)); + sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS); } return rc; } @@ -1070,17 +1071,18 @@ int sqlite3_fossildelta_init( char **pzErrMsg, const sqlite3_api_routines *pApi ){ + static const enc = SQLITE_UTF8|SQLITE_INNOCUOUS; int rc = SQLITE_OK; SQLITE_EXTENSION_INIT2(pApi); (void)pzErrMsg; /* Unused parameter */ - rc = sqlite3_create_function(db, "delta_create", 2, SQLITE_UTF8, 0, + rc = sqlite3_create_function(db, "delta_create", 2, enc, 0, deltaCreateFunc, 0, 0); if( rc==SQLITE_OK ){ - rc = sqlite3_create_function(db, "delta_apply", 2, SQLITE_UTF8, 0, + rc = sqlite3_create_function(db, "delta_apply", 2, enc, 0, deltaApplyFunc, 0, 0); } if( rc==SQLITE_OK ){ - rc = sqlite3_create_function(db, "delta_output_size", 1, SQLITE_UTF8, 0, + rc = sqlite3_create_function(db, "delta_output_size", 1, enc, 0, deltaOutputSizeFunc, 0, 0); } if( rc==SQLITE_OK ){ |