From: dan <Dan Kennedy>
Date: Fri, 11 Jun 2021 12:14:58 +0000 (+0000)
Subject: Fix a crash in new ALTER TABLE code that could follow an OOM.
X-Git-Tag: version-3.36.0~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d03d3a9b745aa5a32370bc41fc0d43cf51b3900c;p=thirdparty%2Fsqlite.git

Fix a crash in new ALTER TABLE code that could follow an OOM.

FossilOrigin-Name: 6f1f2a0a9cd75ca43b81cc325296b843ccefe6f8040da8f2e873f49928423f10
---

diff --git a/manifest b/manifest
index 61cd83accd..cc2649e96f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunreachable\sbranch\sadded\sby\sthe\sprevious\scommit.
-D 2021-06-11T12:02:00.076
+C Fix\sa\scrash\sin\snew\sALTER\sTABLE\scode\sthat\scould\sfollow\san\sOOM.
+D 2021-06-11T12:14:58.334
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 3e76100bb48f1564e643119af8d9b12fd3d50eb4ca146ade027bcbb67dd77edd
+F src/alter.c a5ddc873aeb9c162082735e3f33f0c97eff3827fe3512a9c55699966565c6c24
 F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
 F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
 F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
@@ -655,7 +655,7 @@ F test/alterdropcol.test a653a3945f964d26845ec0cd0a8e74189f46de3119a984c5bc45457
 F test/alterdropcol2.test 527fce683b200d620f560f666c44ae33e22728e990a10a48a543280dfd4b4d41
 F test/alterlegacy.test f38c6d06cda39e1f7b955bbce57f2e3ef5b7cb566d3d1234502093e228c15811
 F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74a3fb80c9
-F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
+F test/altermalloc2.test ca3ebc01670d9313953a2b7628d8cc00dc5ea9988f229b3cbbbe1cca506dae45
 F test/altermalloc3.test 059841a3de6b6780efd9f0b30bf1d9b4443c555f68d39975cbcac2583167b239
 F test/alterqf.test 67568ad152db8c1187b15633b801242cf960f1beafc51261a3d1725d910baeb2
 F test/altertab.test 4120b9b2baa96ef2b0aaf4dd46b1858171503edf5e346b5ce939c73b4d314fa6
@@ -1918,7 +1918,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 8b1f9a51e962cd9a5593a1ecf4da6c86e34c4f9ff96ffcea0fb421880c8836cb
-R a593835381f24a892eaf7459ea247fea
+P 852ee0e91ceae090157c4ab2805530f5d7985a490ce77f54d7b148f56e466f79
+R 4908855f822587627e5ff1f9cc5f199c
 U dan
-Z a43fa53c46b2ebe85b882f7033342509
+Z 6050252f76b9f756fd3413a1f8f80a55
diff --git a/manifest.uuid b/manifest.uuid
index a649f4e781..29b3059d1b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-852ee0e91ceae090157c4ab2805530f5d7985a490ce77f54d7b148f56e466f79
\ No newline at end of file
+6f1f2a0a9cd75ca43b81cc325296b843ccefe6f8040da8f2e873f49928423f10
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index c1a8e24761..e5f1eb3154 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -812,18 +812,19 @@ static void renameWalkWith(Walker *pWalker, Select *pSelect){
     assert( pWith->nCte>0 );
     assert( (pWith->a[0].pSelect->selFlags & SF_Expanded)==0 );
     pCopy = sqlite3WithDup(pParse->db, pWith);
-    sqlite3WithPush(pParse, pCopy, 1);
-
-    for(i=0; i<pWith->nCte; i++){
-      Select *p = pWith->a[i].pSelect;
-      NameContext sNC;
-      memset(&sNC, 0, sizeof(sNC));
-      sNC.pParse = pParse;
-      sqlite3SelectPrep(sNC.pParse, p, &sNC);
-      sqlite3WalkSelect(pWalker, p);
-      sqlite3RenameExprlistUnmap(pParse, pWith->a[i].pCols);
+    if( pCopy ){
+      sqlite3WithPush(pParse, pCopy, 1);
+      for(i=0; i<pWith->nCte; i++){
+        Select *p = pWith->a[i].pSelect;
+        NameContext sNC;
+        memset(&sNC, 0, sizeof(sNC));
+        sNC.pParse = pParse;
+        sqlite3SelectPrep(sNC.pParse, p, &sNC);
+        sqlite3WalkSelect(pWalker, p);
+        sqlite3RenameExprlistUnmap(pParse, pWith->a[i].pCols);
+      }
+      pParse->pWith = pCopy->pOuter;
     }
-    pParse->pWith = pCopy->pOuter;
   }
 }
 
diff --git a/test/altermalloc2.test b/test/altermalloc2.test
index 610b3f6bf0..3d22ad9453 100644
--- a/test/altermalloc2.test
+++ b/test/altermalloc2.test
@@ -98,4 +98,25 @@ do_faultsim_test 4 -faults oom-* -prep {
   faultsim_test_result {0 {}} 
 }
 
+reset_db
+do_execsql_test 5.0 {
+  CREATE TABLE rr(a, b);
+  CREATE VIEW vv AS SELECT * FROM (
+    WITH abc(d, e) AS (SELECT * FROM rr)
+    SELECT * FROM abc
+  );
+} {}
+
+faultsim_save_and_close
+do_faultsim_test 5 -faults oom-* -prep {
+  faultsim_restore_and_reopen
+  execsql { SELECT * FROM sqlite_master }
+} -body {
+  execsql {
+    ALTER TABLE rr RENAME TO c;
+  }
+} -test {
+  faultsim_test_result {0 {}} 
+}
+
 finish_test