diff options
| author | dan <dan@noemail.net> | 2015-03-21 15:45:24 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-03-21 15:45:24 +0000 |
| commit | 71138b0f0fe7746b685d2cafb6ce821d1a1dd69b (patch) | |
| tree | 702071165ccf40e4a1728080fcfb262369e0e57e /src/vdbeblob.c | |
| parent | 8885708c3ceebe9f7b7f7851faf1ca3c998b0f2e (diff) | |
| parent | b4e0fd26e3fad8124dd51a1ee1dc6e6286eff5a0 (diff) | |
| download | sqlite-71138b0f0fe7746b685d2cafb6ce821d1a1dd69b.tar.gz sqlite-71138b0f0fe7746b685d2cafb6ce821d1a1dd69b.zip | |
Merge trunk changes with this branch.
FossilOrigin-Name: 142743918fd5a6d79fa10c44398360c3684a255a
Diffstat (limited to 'src/vdbeblob.c')
| -rw-r--r-- | src/vdbeblob.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/vdbeblob.c b/src/vdbeblob.c index cf1eb5905..ea01f5ce8 100644 --- a/src/vdbeblob.c +++ b/src/vdbeblob.c @@ -154,12 +154,17 @@ int sqlite3_blob_open( Incrblob *pBlob = 0; #ifdef SQLITE_ENABLE_API_ARMOR - if( !sqlite3SafetyCheckOk(db) || ppBlob==0 || zTable==0 ){ + if( ppBlob==0 ){ return SQLITE_MISUSE_BKPT; } #endif - flags = !!flags; /* flags = (flags ? 1 : 0); */ *ppBlob = 0; +#ifdef SQLITE_ENABLE_API_ARMOR + if( !sqlite3SafetyCheckOk(db) || zTable==0 ){ + return SQLITE_MISUSE_BKPT; + } +#endif + flags = !!flags; /* flags = (flags ? 1 : 0); */ sqlite3_mutex_enter(db->mutex); @@ -373,7 +378,7 @@ static int blobReadWrite( sqlite3_mutex_enter(db->mutex); v = (Vdbe*)p->pStmt; - if( n<0 || iOffset<0 || (iOffset+n)>p->nByte ){ + if( n<0 || iOffset<0 || ((sqlite3_int64)iOffset+n)>p->nByte ){ /* Request is out of range. Return a transient error. */ rc = SQLITE_ERROR; }else if( v==0 ){ |