mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent a possible use-after-free bug in the query optimizer.

Browse Source 
FossilOrigin-Name: 0a98c8d76ac86412d5eb68de994658c250989349
This commit is contained in:
drh 2016-11-20 12:00:27 +00:00
parent 9c8753c0a8
commit 0f85b2ff09
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Fix\sa\sproblem\sin\srtreeD.test\scausing\sit\sto\sfail\sin\sOMIT_BUILTIN_TEST\sbuilds. C Prevent\sa\spossible\suse-after-free\sbug\sin\sthe\squery\soptimizer.
D 2016-11-17T20:05:00.694 D 2016-11-20T12:00:27.508
F Makefile.in 6b572807415d3f0a379cebc9461416d8df4a12c8 F Makefile.in 6b572807415d3f0a379cebc9461416d8df4a12c8
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc bb4d970894abbbe0e88d00aac29bd52af8bc95f4 F Makefile.msc bb4d970894abbbe0e88d00aac29bd52af8bc95f4
@ -471,7 +471,7 @@ F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
F src/where.c 952f76e7a03727480b274b66ca6641b1657cd591 F src/where.c 952f76e7a03727480b274b66ca6641b1657cd591
F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
F src/wherecode.c 4ea298998499db5a407ffd70e87e119a86ed7834 F src/wherecode.c 4ea298998499db5a407ffd70e87e119a86ed7834
F src/whereexpr.c a83d70154f3bbce5051a7e9710021f647c0fe4f2 F src/whereexpr.c c19a84ac530835d37217db2181e4fe75901b7b97
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@ -1534,7 +1534,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 2331192b4ca6a169b6ac0daafb21ceb7c390de65 P d6b3779e6dad038d8bc35139cf314bf1e6e91977
R 252cde6585f71191b31af3499dd16889 R 830f3978b6b30c614984da775063fd9f
U dan U drh
Z 3bd9299c3f417af0dbc0173ca4fc27e5 Z d214ac5b563755a186f4bc035514a8e0

2
manifest.uuid
View File

@ -1 +1 @@
d6b3779e6dad038d8bc35139cf314bf1e6e91977 0a98c8d76ac86412d5eb68de994658c250989349

2
src/whereexpr.c
View File

@ -1270,6 +1270,8 @@ static void exprAnalyze(
/* Prevent ON clause terms of a LEFT JOIN from being used to drive /* Prevent ON clause terms of a LEFT JOIN from being used to drive
** an index for tables to the left of the join. ** an index for tables to the left of the join.
*/ */
testcase( pTerm!=&pWC->a[idxTerm] );
pTerm = &pWC->a[idxTerm];
pTerm->prereqRight |= extraRight; pTerm->prereqRight |= extraRight;
} }