aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordan <dan@noemail.net>2010-01-20 14:25:37 +0000
committerdan <dan@noemail.net>2010-01-20 14:25:37 +0000
commit14d4cc4356955751d9848f0364f2fef2c9196ccc (patch)
tree8673ae4dadf1c169864bfd668bc928d1f562af25 /src
parent7ed97b9de9bd406de2f8c998228a27ea668d540c (diff)
downloadsqlite-14d4cc4356955751d9848f0364f2fef2c9196ccc.tar.gz
sqlite-14d4cc4356955751d9848f0364f2fef2c9196ccc.zip
Fix a problem with handling OOM errors in fts3.
FossilOrigin-Name: f9c54e95ecf1c36c4750bb151e91d81c1d1bd596
Diffstat (limited to 'src')
-rw-r--r--src/vdbeapi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 6f827ec6e..6cbc95459 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -299,9 +299,10 @@ static int sqlite3Step(Vdbe *p){
return SQLITE_MISUSE;
}
- /* Assert that malloc() has not failed */
+ /* Check that malloc() has not failed. If it has, return early. */
db = p->db;
if( db->mallocFailed ){
+ p->rc = SQLITE_NOMEM;
return SQLITE_NOMEM;
}