Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | In sqlite3NestedParse() be sure to detect all SQLITE_NOMEM and SQLITE_TOOBIG errors and to distinguish between them. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: | 73056b314bd63288c662752e9bd469b7 |
| User & Date: | drh 2019-02-22 16:18:12 |
Context
|
2019-02-22
| ||
| 19:24 | Internally, remove all references to a Window object that belongs to an expression in an ORDER BY clause if that expression is converted to an alias of a result-set expression. Fix for [4feb3159c6]. check-in: 579b66ea user: dan tags: trunk | |
| 17:44 | Merge latest trunk changes into this branch. check-in: 001771af user: dan tags: reuse-schema | |
| 16:18 | In sqlite3NestedParse() be sure to detect all SQLITE_NOMEM and SQLITE_TOOBIG errors and to distinguish between them. check-in: 73056b31 user: drh tags: trunk | |
| 15:42 | Modify sqlite3_str_finish() and sqlite3VMPrintf() so that they always return NULL on any OOM or SQLITE_LIMIT_LENGTH error. check-in: e7144ffd user: drh tags: trunk | |
Changes
Changes to src/build.c.
256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 |
if( pParse->nErr ) return;
assert( pParse->nested<10 ); /* Nesting should only be of limited depth */
va_start(ap, zFormat);
zSql = sqlite3VMPrintf(db, zFormat, ap);
va_end(ap);
if( zSql==0 ){
return; /* A malloc must have failed */
}
pParse->nested++;
memcpy(saveBuf, PARSE_TAIL(pParse), PARSE_TAIL_SZ);
memset(PARSE_TAIL(pParse), 0, PARSE_TAIL_SZ);
sqlite3RunParser(pParse, zSql, &zErrMsg);
sqlite3DbFree(db, zErrMsg);
sqlite3DbFree(db, zSql);
|
| > > > > |
256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 |
if( pParse->nErr ) return;
assert( pParse->nested<10 ); /* Nesting should only be of limited depth */
va_start(ap, zFormat);
zSql = sqlite3VMPrintf(db, zFormat, ap);
va_end(ap);
if( zSql==0 ){
/* This can result either from an OOM or because the formatted string
** exceeds SQLITE_LIMIT_LENGTH. In the latter case, we need to set
** an error */
if( !db->mallocFailed ) pParse->rc = SQLITE_TOOBIG;
return;
}
pParse->nested++;
memcpy(saveBuf, PARSE_TAIL(pParse), PARSE_TAIL_SZ);
memset(PARSE_TAIL(pParse), 0, PARSE_TAIL_SZ);
sqlite3RunParser(pParse, zSql, &zErrMsg);
sqlite3DbFree(db, zErrMsg);
sqlite3DbFree(db, zSql);
|
Changes to test/indexfault.test.
332 333 334 335 336 337 338 339 340 341 342 |
faultsim_restore_and_reopen
set ::nReadCall 0
sqlite3_soft_heap_limit 0
} -body {
execsql { CREATE INDEX i1 ON t1(x) }
faultsim_test_result {0 {}}
}
uninstall_custom_faultsim
finish_test
|
> > > > > > > > > > |
332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 |
faultsim_restore_and_reopen
set ::nReadCall 0
sqlite3_soft_heap_limit 0
} -body {
execsql { CREATE INDEX i1 ON t1(x) }
faultsim_test_result {0 {}}
}
do_faultsim_test 5 -prep {
reset_db
} -body {
execsql {
CREATE TABLE reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongname(a PRIMARY KEY) WITHOUT ROWID;
}
} -test {
faultsim_test_result {0 {}}
}
uninstall_custom_faultsim
finish_test
|