diff options
| author | drh <drh@noemail.net> | 2017-03-10 17:03:11 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2017-03-10 17:03:11 +0000 |
| commit | a6bf20b5872cf8c8490c7efd1f908600a50ec34d (patch) | |
| tree | 9fd5df403057d752cc27d03fcff30baac543cc49 /src/malloc.c | |
| parent | 1e45c7db569018ed90a8ba8176342d0912366778 (diff) | |
| download | sqlite-a6bf20b5872cf8c8490c7efd1f908600a50ec34d.tar.gz sqlite-a6bf20b5872cf8c8490c7efd1f908600a50ec34d.zip | |
Fix an error in the SQLITE_MAX_MEMORY implementation resulting from a bad
merge. Update the OSSFuzz interface so that it times out after running
the byte-code engine for 10 seconds.
FossilOrigin-Name: f8560c60d10c0365b33342ab05b5a953987b0471
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/malloc.c b/src/malloc.c index 2b903cc61..6d4910779 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -232,7 +232,8 @@ static void mallocWithAlarm(int n, void **pp){ #ifdef SQLITE_MAX_MEMORY if( sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED)+nFull>SQLITE_MAX_MEMORY ){ - return 0; + *pp = 0; + return; } #endif |