Enhance renameParseSql() to better handle OOMs.

FossilOrigin-Name: 68bcde7ab57b2d4bdcfb2f6c7134a0b01a504b2e7cdf6ee5bf0df70fb4a517b0

diff --git a/manifest b/manifest
index c7e6117f2e1a5056137c1b03baf79a9e170d387f..814d0fb5c678d4b609ad53fcc4c2f46426327d98 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\schanges\sfrom\strunk\sinto\sthe\salter-table-drop-column\sbranch.
-D 2021-02-18T22:47:34.981
+C Enhance\srenameParseSql()\sto\sbetter\shandle\sOOMs.
+D 2021-02-18T23:03:50.874
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -475,7 +475,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c c2d554c43d0e4c3d264f5d9130bc51ebc581ad04c86f998707006ab9b34c25d8
+F src/alter.c fedd5c9e8d2b11564e3973cf8703c2fb2302e5a214e5c4c48da6b1438c9145ef
 F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
 F src/attach.c e80162a47411f296bea550ed8fafd730481f4aa71e89ece23ba9c957eed15d4a
 F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
@@ -1902,7 +1902,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 e5f144182bbb3ba10c77151cf63c8bddf86374049fb6866387f85e335df298cb 3c25cb4ab8885a50e2a485fe76f5ffd5dd8ebe1306aca8c0989e0b7fd7dd18d2
-R 7a26bb4b78580fad399e64abb8851442
+P 9ea640073f8809dfe2612ae1ea384a938b433f884c54d9e5aa3712de79397ac1
+R 527e6c9ac23803f3ec7175bf228774c2
 U drh
-Z dbdaa6bf28df7e70f0af3298f4e6f0bf
+Z 50f2afee92ce107a5465565f794dcaa9

diff --git a/manifest.uuid b/manifest.uuid
index 31dc178056f24fa27bf4fd19a9b4390c64587343..2e5910cb015ef7914301ecdbfcc32f70f7f310f2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ea640073f8809dfe2612ae1ea384a938b433f884c54d9e5aa3712de79397ac1
\ No newline at end of file
+68bcde7ab57b2d4bdcfb2f6c7134a0b01a504b2e7cdf6ee5bf0df70fb4a517b0
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index e34a592be0507ea633869fe6df016afc035116ba..c630f0ded295ea03e06f44bc67e8efb29c263852 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -1062,7 +1062,7 @@ static int renameParseSql(
   p->eParseMode = PARSE_MODE_RENAME;
   p->db = db;
   p->nQueryLoop = 1;
-  rc = sqlite3RunParser(p, zSql, &zErr);
+  rc = zSql ? sqlite3RunParser(p, zSql, &zErr) : SQLITE_NOMEM;
   assert( p->zErrMsg==0 );
   assert( rc!=SQLITE_OK || zErr==0 );
   p->zErrMsg = zErr;