From: drh Date: Tue, 12 Jan 2016 02:00:24 +0000 (+0000) Subject: Fix an uninitialized field in the Select object when SELECTTRACE is enabled. X-Git-Tag: version-3.11.0~162 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ca33fa4c26467330a13d74f1646b27d869ff147;p=thirdparty%2Fsqlite.git Fix an uninitialized field in the Select object when SELECTTRACE is enabled. FossilOrigin-Name: fc62851667d9120f98a2641c87bbc5a2485482b2 --- diff --git a/manifest b/manifest index 7ae248f6b9..6575eb3b4e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Various\s#ifdef\senhancements\sfor\simproved\sVxWorks\ssupport. -D 2016-01-12T00:37:55.072 +C Fix\san\suninitialized\sfield\sin\sthe\sSelect\sobject\swhen\sSELECTTRACE\sis\senabled. +D 2016-01-12T02:00:24.480 F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042 @@ -333,7 +333,7 @@ F src/printf.c af589a27b7d40f6f4f704e9eea99f02f18ad6d32 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e -F src/select.c d84c091185bc160c349e8bf460ebd084dbd77e64 +F src/select.c 372234e3554a7917544242563216af760d7d4219 F src/shell.c ed71dc7679e6f087a3f1ea3f9dae4b0fae7209c3 F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad @@ -1407,7 +1407,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 28bd8d5fc541464b69886b7e886939035b42a869 -R a0f920051028c27b520313db4d779ce4 +P 75cd41ff179e29c5d45f9d7fed784bc339e0d7a0 +R f2bd43aeba2b6092057d74bc062b9600 U drh -Z 6a1495f4c4d6026f44345482bd14549e +Z 0ab9387fbd675bc198faa7ea2440e420 diff --git a/manifest.uuid b/manifest.uuid index 6f028487c4..cb7f85349f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -75cd41ff179e29c5d45f9d7fed784bc339e0d7a0 \ No newline at end of file +fc62851667d9120f98a2641c87bbc5a2485482b2 \ No newline at end of file diff --git a/src/select.c b/src/select.c index b1db07d09a..0e7c4595d1 100644 --- a/src/select.c +++ b/src/select.c @@ -124,6 +124,9 @@ Select *sqlite3SelectNew( pNew->selFlags = selFlags; pNew->iLimit = 0; pNew->iOffset = 0; +#if SELECTTRACE_ENABLED + pNew->zSelName[0] = 0; +#endif pNew->addrOpenEphm[0] = -1; pNew->addrOpenEphm[1] = -1; pNew->nSelectRow = 0;