Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Avoid leaving view-definitions with an incomplete set of column names/types in the in-memory schema if an OOM strikes while allocating the same. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
1ddbb5372e7ea8407369b88698b3fb92 |
| User & Date: | dan 2018-07-09 18:55:44 |
Context
|
2018-07-09
| ||
| 20:41 | Add an ALWAYS() around a branch in sqlite3BtreeSkipNext() that we believe must always be true. check-in: 12be361a user: drh tags: trunk | |
| 18:55 | Avoid leaving view-definitions with an incomplete set of column names/types in the in-memory schema if an OOM strikes while allocating the same. check-in: 1ddbb537 user: dan tags: trunk | |
| 18:11 | Add a couple of OOM tests. check-in: 50de2a0d user: dan tags: trunk | |
Changes
Changes to src/build.c.
2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 |
sqlite3DeleteTable(db, pSelTab);
sqlite3SelectDelete(db, pSel);
db->lookaside.bDisable--;
} else {
nErr++;
}
pTable->pSchema->schemaFlags |= DB_UnresetViews;
#endif /* SQLITE_OMIT_VIEW */
return nErr;
}
#endif /* !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) */
#ifndef SQLITE_OMIT_VIEW
/*
|
> > > > > |
2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 |
sqlite3DeleteTable(db, pSelTab);
sqlite3SelectDelete(db, pSel);
db->lookaside.bDisable--;
} else {
nErr++;
}
pTable->pSchema->schemaFlags |= DB_UnresetViews;
if( db->mallocFailed ){
sqlite3DeleteColumnNames(db, pTable);
pTable->aCol = 0;
pTable->nCol = 0;
}
#endif /* SQLITE_OMIT_VIEW */
return nErr;
}
#endif /* !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) */
#ifndef SQLITE_OMIT_VIEW
/*
|
Added test/schemafault.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
# 2018-08-19 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # Test OOM injection in schema-related operations. # set testdir [file dirname $argv0] source $testdir/tester.tcl source $testdir/malloc_common.tcl set testprefix schemafault do_execsql_test 1.0 { CREATE TABLE t2(aaa INTTT); CREATE VIEW v2(xxx , yyy) AS SELECT aaa, aaa+1 FROM t2; } do_faultsim_test 1 -faults oom-* -prep { } -body { execsql { SELECT * FROM v2 } } -test { faultsim_test_result {0 {}} } finish_test |