diff options
| author | dan <dan@noemail.net> | 2016-11-04 12:05:29 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2016-11-04 12:05:29 +0000 |
| commit | a2bfa046ea93dab08e025809f4fea2629c71fbea (patch) | |
| tree | 85935c8d91f6870225203ae718e95a679f8cea69 /src | |
| parent | b1c9633493e484d541bd1a9c90ee2108dbcb15f8 (diff) | |
| download | sqlite-a2bfa046ea93dab08e025809f4fea2629c71fbea.tar.gz sqlite-a2bfa046ea93dab08e025809f4fea2629c71fbea.zip | |
Avoid a crash that can occur after an obscure OOM in the built-in INSTR()
function.
FossilOrigin-Name: b86b79c442a58d10aa005ba4f34095375a88d242
Diffstat (limited to 'src')
| -rw-r--r-- | src/func.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/func.c b/src/func.c index 79bb1e3dd..6ec0962de 100644 --- a/src/func.c +++ b/src/func.c @@ -208,6 +208,8 @@ static void instrFunc( zHaystack = sqlite3_value_text(argv[0]); zNeedle = sqlite3_value_text(argv[1]); isText = 1; + if( zNeedle==0 ) return; + assert( zHaystack ); } while( nNeedle<=nHaystack && memcmp(zHaystack, zNeedle, nNeedle)!=0 ){ N++; |