From: drh <drh@noemail.net>
Date: Fri, 5 Aug 2016 14:35:47 +0000 (+0000)
Subject: Fix a very obscure problem following OOM in sqlite3_declare_vtab().
X-Git-Tag: version-3.14.0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0aafa9c89c543b6f9bb5c81346bd196d062e05a8;p=thirdparty%2Fsqlite.git

Fix a very obscure problem following OOM in sqlite3_declare_vtab().

FossilOrigin-Name: 68eac74874d0646369bef3650c6cb271cca62ab4
---

diff --git a/manifest b/manifest
index 5b9bd0d8e5..ad19c3dbd6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Revert\sthe\sSQLITE_APICALL\schanges\sfor\snow.\s\sThat\schanges\sneeds\sfurther\nresearch\sbefore\sit\sis\sreleased.\s\sDeferred\suntil\s3.15.
-D 2016-08-04T13:23:28.286
+C Fix\sa\svery\sobscure\sproblem\sfollowing\sOOM\sin\ssqlite3_declare_vtab().
+D 2016-08-05T14:35:47.568
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -330,7 +330,7 @@ F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 F src/btree.c 2551bd3ecb8b8988fb8b23aabadfb214dbc38e46
 F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
-F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6
+F src/build.c 7c3c780b703c09314032c8f6e4e7c1d80241a818
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
@@ -1509,7 +1509,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 b7f30a9ff20d580fdaecdcf2b644d09ad6c2575e
-R 54afa4c645a3de150c21fe8a3504aa0b
+P 9adda385267d1a0ecff259b42a284913668441a2
+R 36d01c6d4e5d55fe676a3ca2e553d6b8
 U drh
-Z 5a54570e253d8550ab3d18086a0dcdce
+Z 0d50083da402e96d80dd6dfcbaebaad9
diff --git a/manifest.uuid b/manifest.uuid
index 3bacaad736..6bcb510d7d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9adda385267d1a0ecff259b42a284913668441a2
\ No newline at end of file
+68eac74874d0646369bef3650c6cb271cca62ab4
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 52f6f200f8..b14e6f2fc2 100644
--- a/src/build.c
+++ b/src/build.c
@@ -3037,6 +3037,13 @@ void sqlite3CreateIndex(
     if( zName==0 ){
       goto exit_create_index;
     }
+
+    /* Automatic index names generated from within sqlite3_declare_vtab()
+    ** must have names that are distinct from normal automatic index names.
+    ** The following statement converts "sqlite3_autoindex..." into
+    ** "sqlite3_butoindex..." in order to make the names distinct.
+    ** The "vtab_err.test" test demonstrates the need of this statement. */
+    if( IN_DECLARE_VTAB ) zName[7]++;
   }
 
   /* Check for authorization to create an index.