From: drh <drh@noemail.net>
Date: Wed, 23 Nov 2016 19:40:23 +0000 (+0000)
Subject: Take care not to try to generate code for the ATTACH and DETACH commands
X-Git-Tag: version-3.15.2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c657d8c2a9cfd4560b7b714007100d3ead313afa;p=thirdparty%2Fsqlite.git

Take care not to try to generate code for the ATTACH and DETACH commands
if there were syntax errors during parsing.
Fix for ticket [2f1b168ab4d4844]

FossilOrigin-Name: f8cf7ff1560dbd0dde5e6d4c9c22cd8ff43cce09
---

diff --git a/manifest b/manifest
index bc8accacde..639708e35e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.15.1
-D 2016-11-04T12:08:49.492
+C Take\scare\snot\sto\stry\sto\sgenerate\scode\sfor\sthe\sATTACH\sand\sDETACH\scommands\nif\sthere\swere\ssyntax\serrors\sduring\sparsing.\nFix\sfor\sticket\s[2f1b168ab4d4844]
+D 2016-11-23T19:40:23.266
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -325,7 +325,7 @@ F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 299117695b1f21ac62dfc5b608588810ba22ed0d
 F src/analyze.c 8b62b2cf4da85451534ac0af82cafc418d837f68
-F src/attach.c 8c19066b4b5357b5d66154e856c61df01e71203a
+F src/attach.c f6725410c184a80d8141b294fdf98a854c8a52b5
 F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
@@ -807,7 +807,7 @@ F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test d202a7606d23f90988a664e88e268aed1087c11c
 F test/func4.test 6beacdfcb0e18c358e6c2dcacf1b65d1fa80955f
 F test/func5.test cdd224400bc3e48d891827cc913a57051a426fa4
-F test/fuzz-oss1.test 4912e528ec9cf2f42134456933659d371c9e0d74
+F test/fuzz-oss1.test e58330d01cbbd8215ee636b17a03fe220b37dbfa
 F test/fuzz.test 96083052bf5765e4518c1ba686ce2bab785670d1
 F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
 F test/fuzz3.test b47377143f0c80f91ed29d722861077ff34415d5
@@ -1526,10 +1526,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 752e14d9b4ca9eec5531bccbde1548e6f06c9474
-R 1292292e2b28a3c5e4e5e50ea87f1dc9
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.15.1 *
+P 1136863c76576110e710dd5d69ab6bf347c65e36
+Q +b0ff183b8ffdbebece06cfea1c6781fc0e8e8547
+R 534688f059b6abac9d5805bc477578d2
 U drh
-Z 6c9c566dbe982b00980b99261c262807
+Z 873fee1c2df99e57735b6ca81b878cf4
diff --git a/manifest.uuid b/manifest.uuid
index e16c29bd12..f097bb4b6b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1136863c76576110e710dd5d69ab6bf347c65e36
\ No newline at end of file
+f8cf7ff1560dbd0dde5e6d4c9c22cd8ff43cce09
\ No newline at end of file
diff --git a/src/attach.c b/src/attach.c
index 507b9c1238..4fe97bacea 100644
--- a/src/attach.c
+++ b/src/attach.c
@@ -325,6 +325,7 @@ static void codeAttach(
   sqlite3* db = pParse->db;
   int regArgs;
 
+  if( pParse->nErr ) goto attach_end;
   memset(&sName, 0, sizeof(NameContext));
   sName.pParse = pParse;
 
diff --git a/test/fuzz-oss1.test b/test/fuzz-oss1.test
index 08bc670845..e77b7ed0f8 100644
--- a/test/fuzz-oss1.test
+++ b/test/fuzz-oss1.test
@@ -1997,5 +1997,9 @@ NULL AND ("9_u" COLLATE NOCASE = ? COLLATE NOCASE))) FROM (SELECT
   }
 } {/.* Goto .*/}
 
+# Crash reported by OSS-FUZZ on 2016-11-10
+do_catchsql_test fuzz-oss1-detach {
+  DETACH x IS #1;
+} {1 {near "#1": syntax error}}
 
 finish_test