From: dan <Dan Kennedy>
Date: Sat, 12 Feb 2022 13:37:27 +0000 (+0000)
Subject: Avoid dropping SQLITE_TOOBIG errors in the quote() function.
X-Git-Tag: version-3.38.0~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af7b8dcb585399c91514e266150c64262999614a;p=thirdparty%2Fsqlite.git

Avoid dropping SQLITE_TOOBIG errors in the quote() function.

FossilOrigin-Name: 115c3051a1ff7567e84f14fc4c49efe61bc2850248533449b0195c305ab6516e
---

diff --git a/manifest b/manifest
index 903db79b3e..21928f5b4f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\sin\swithout_rowid1.test\sso\sthat\sit\sis\sdisabled\swithout\nALTER\sTABLE\ssupport,\sas\sit\suses\sALTER\sTABLE.
-D 2022-02-11T21:20:46.962
+C Avoid\sdropping\sSQLITE_TOOBIG\serrors\sin\sthe\squote()\sfunction.
+D 2022-02-12T13:37:27.925
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -506,7 +506,7 @@ F src/delete.c b5f1716b4d723db48254ee0f896e362cd029e865e05414139ea7f539f3884e1d
 F src/expr.c b90a029105a93a93a0ed5e5f8c5eaed8f19043a3b62e4c4d235a4611d9ada178
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 06e4ac33031b02dde7130c12e79cddf4dc5cfa72b23d8e63a3c26878fc9c1d3c
-F src/func.c 5a0379450bd19ca5cb2d65327b0df6466a14fa0f06f9355329c3e0eec483519a
+F src/func.c f801c6bc8b30afea51817d86a6c46259d3cca180c612cfa0a30b18d661e9c8df
 F src/global.c a3daa18a1696aadd94f18d37cbbdebf0bbdb827b8397a534f021cd56c15cd0f9
 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -1944,8 +1944,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 3409fd4150df059d7308f79fa3672a330af9cefe2ad9120c3da5ef1413921e96
-R 11d69b7df4beb804da28e670c98327ec
-U drh
-Z 9996eb8f83b13066aef559fa4b83d323
+P ca22a64e6f05a6688974f4cff1a0ff2c873aad1947f3cf6ffaeee8bb074b2627
+R 2e6d581fd6e56ff441925392bf096f8f
+U dan
+Z 130ae51273ca1e2d6d860abf05c086cc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 476053a91b..8d5035b3a3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ca22a64e6f05a6688974f4cff1a0ff2c873aad1947f3cf6ffaeee8bb074b2627
\ No newline at end of file
+115c3051a1ff7567e84f14fc4c49efe61bc2850248533449b0195c305ab6516e
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index d7ca756de8..c15f5c73e7 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1120,8 +1120,9 @@ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
   sqlite3QuoteValue(&str,argv[0]);
   sqlite3_result_text(context, sqlite3StrAccumFinish(&str), str.nChar,
                       SQLITE_DYNAMIC);
-  if( str.accError==SQLITE_NOMEM ){
-    sqlite3_result_error_nomem(context);
+  if( str.accError!=SQLITE_OK ){
+    sqlite3_result_null(context);
+    sqlite3_result_error_code(context, str.accError);
   }
 }