database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-03 16:53:36 +03:00
Code Activity

Make sure the Vdbe.expmask value is set correctly in sqlite3VdbeSwap().

Browse Source 
This fixes a problem introduced by [a8fd7052].

FossilOrigin-Name: 29f54b899e5cf22ece98ab41c39c41d75a4b228d
This commit is contained in:
drh
2017-03-02 13:13:30 +00:00
parent 2147221c36
commit 76adb23980
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sa\suse-after-free\sproblem\sin\sthe\sshell\stool\scode\sthat\scould\soccur\sif\san\sSQL\nstatement\swere\sexecuted\safter\san\s".open"\scommand\swith\sinvalid\soptions. C Make\ssure\sthe\sVdbe.expmask\svalue\sis\sset\scorrectly\sin\ssqlite3VdbeSwap().\nThis\sfixes\sa\sproblem\sintroduced\sby\s[a8fd7052].
D 2017-03-01T11:30:27.730 D 2017-03-02T13:13:30.327
F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2 F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@ -467,7 +467,7 @@ F src/vdbe.c 83f387d9e6842b1dc99f6e85bb577c5bbc4e397d
F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
F src/vdbeapi.c 70aabe108c411e529a59d8800445513965334062 F src/vdbeapi.c 70aabe108c411e529a59d8800445513965334062
F src/vdbeaux.c 031422c66e272c7f1027070e7f0858f4c418dfbc F src/vdbeaux.c b632f9151a296c5eb22a2cc955c487ebc2347cb6
F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9 F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
@@ -1559,7 +1559,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 23a8917e848a999533bc66467f7cb2f4f3d45bc1 P ac760db0727209db0a816e112ea5f47e54d54dac
R 6f5948ee4f1d68e0584e854f4c330a6f R be25bb329cc9311f7d92b42176424b6a
U dan U drh
Z 4914d52d58dfba6bed9b5d6006acef82 Z eb983447910676b385a2c6496a637326

2
manifest.uuid
View File

@@ -1 +1 @@
ac760db0727209db0a816e112ea5f47e54d54dac 29f54b899e5cf22ece98ab41c39c41d75a4b228d

1
src/vdbeaux.c
View File

@@ -86,6 +86,7 @@ void sqlite3VdbeSwap(Vdbe *pA, Vdbe *pB){
pA->zSql = pB->zSql; pA->zSql = pB->zSql;
pB->zSql = zTmp; pB->zSql = zTmp;
pB->isPrepareV2 = pA->isPrepareV2; pB->isPrepareV2 = pA->isPrepareV2;
pB->expmask = pA->expmask;
} }
/* /*