From a1bd5c6aae64da59b5ef91f0fd08200cec8de359 Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 13 Jan 2019 00:58:57 +0000 Subject: [PATCH] Move a local variable declaration into the outermost scope in which it is used. This fixes an ASAN warning. FossilOrigin-Name: ac3b6021d9437ab1c027850d321f0a3e575b008763d8d515e2347f7d4e7c294b --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/alter.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 284b6f827a..ced5390f3c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Prevent\sunsigned\s32-bit\sinteger\soverflow\sfrom\sleading\sto\sa\sbuffer\soverread\ninside\sof\san\sassert().\s\sThe\sproblem\sfixed\shere\sis\sno\sreachable\sin\sproduction\ncode. -D 2019-01-12T21:30:26.399 +C Move\sa\slocal\svariable\sdeclaration\sinto\sthe\soutermost\sscope\sin\swhich\sit\nis\sused.\sThis\sfixes\san\sASAN\swarning. +D 2019-01-13T00:58:57.018 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 45a3fef4d325ac0220c2172aeec4e4321da351f073f3b8e8ddea655f49ef6f2b @@ -446,7 +446,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a -F src/alter.c 9dda6a9cb20634fc4f65101a57ec43692f729164fa60dc1b0c78d344184a8431 +F src/alter.c 8ac946d83b7888faf1707e4fdc9b37e61ec83325bb3d6b1a6d382d3287d0c8d8 F src/analyze.c 58db66344a5c58dcabb57f26696f6f2993956c830446da40b444051d2fdaf644 F src/attach.c 92b51739a885da8bd84bc9a05485f1e48148bce5c15432f059b45af98fff75cd F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df @@ -1798,7 +1798,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 726e398b9ddc15ea1b67c40e2a12ddf5d04428a866699588c5fa1af75af846e1 -R 8923f98ae861c2545d072606e0c54a90 +P 0f850a25d67a752fe1e9059c0c3f78e00c222113e556a7605fd3c50817b573cb +R d1042653a3404af381612d805e6f7ade U drh -Z 4318e33986f46462cf28ea3b5c858257 +Z c1dc9aa41961f051bb56f64dcc557e3c diff --git a/manifest.uuid b/manifest.uuid index 7adf65b3f4..ce21ac2791 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0f850a25d67a752fe1e9059c0c3f78e00c222113e556a7605fd3c50817b573cb \ No newline at end of file +ac3b6021d9437ab1c027850d321f0a3e575b008763d8d515e2347f7d4e7c294b \ No newline at end of file diff --git a/src/alter.c b/src/alter.c index a47e18daf1..07fe6e757a 100644 --- a/src/alter.c +++ b/src/alter.c @@ -1081,6 +1081,7 @@ static int renameResolveTrigger(Parse *pParse, const char *zDb){ Trigger *pNew = pParse->pNewTrigger; TriggerStep *pStep; NameContext sNC; + SrcList sSrc; int rc = SQLITE_OK; memset(&sNC, 0, sizeof(sNC)); @@ -1111,7 +1112,6 @@ static int renameResolveTrigger(Parse *pParse, const char *zDb){ if( pTarget==0 ){ rc = SQLITE_ERROR; }else if( SQLITE_OK==(rc = sqlite3ViewGetColumnNames(pParse, pTarget)) ){ - SrcList sSrc; memset(&sSrc, 0, sizeof(sSrc)); sSrc.nSrc = 1; sSrc.a[0].zName = pStep->zTarget;