1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-19 21:43:15 +03:00

Fix a potential reference off the end of an array in the query planner.

FossilOrigin-Name: f15591f80212dd6d4ed8e0f14be691cd578d4cdf
This commit is contained in:
drh
2013-08-19 14:19:00 +00:00
parent 77dfd5bb44
commit 9e48788e9d
3 changed files with 10 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
C Fixes\sfor\sharmless\scompiler\swarnings. C Fix\sa\spotential\sreference\soff\sthe\send\sof\san\sarray\sin\sthe\squery\splanner.
D 2013-08-19T11:15:48.054 D 2013-08-19T14:19:00.852
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -290,7 +290,7 @@ F src/vtab.c 2e8b489db47e20ae36cd247932dc671c9ded0624
F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
F src/where.c 67a823e7816464bc1de998841e87a2a3e4c20a94 F src/where.c be91b3d1100371d7fa833243dde4b5f899db1b4f
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1105,7 +1105,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P 65a85a156f3c827890e9f1fd22484a2f875c3b6f P a0d9ca4f07f1dc3a189864f8ed9cdb0b1d791b1a
R d8f5ca6c104ad88cbb780c1e3e66f865 R 7814fe8b877f36736599d6b4fcf64783
U drh U drh
Z a9ff7ee6c83dbd598cfc582a60fae5a4 Z 7fdb52a55035dac9e0e9155bec61e50b

View File

@@ -1 +1 @@
a0d9ca4f07f1dc3a189864f8ed9cdb0b1d791b1a f15591f80212dd6d4ed8e0f14be691cd578d4cdf

View File

@@ -4337,7 +4337,9 @@ static int whereLoopAddBtreeIndex(
int nIn = 0; int nIn = 0;
if( pTerm->prereqRight & pNew->maskSelf ) continue; if( pTerm->prereqRight & pNew->maskSelf ) continue;
#ifdef SQLITE_ENABLE_STAT3 #ifdef SQLITE_ENABLE_STAT3
if( (pTerm->wtFlags & TERM_VNULL)!=0 && pSrc->pTab->aCol[iCol].notNull ){ if( (pTerm->wtFlags & TERM_VNULL)!=0
&& (iCol<0 || pSrc->pTab->aCol[iCol].notNull)
){
continue; /* skip IS NOT NULL constraints on a NOT NULL column */ continue; /* skip IS NOT NULL constraints on a NOT NULL column */
} }
#endif #endif