From: drh <> Date: Thu, 25 Jun 2026 15:17:15 +0000 (+0000) Subject: Change the undocumented and unsupported sqlite_log() SQL function so that X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c07e6ad039c86350c26c40647a680921d529eb6f;p=thirdparty%2Fsqlite.git Change the undocumented and unsupported sqlite_log() SQL function so that it is marked as unsafe and direct-only. [bugs:/info/3311f8d5b8|Bug 2026-06-25T10:19:43Z]. FossilOrigin-Name: c30ea3cefe346a3d87b57710a51b059371543c5abc75d08c4ca827bbe3b3f622 --- diff --git a/manifest b/manifest index fa3136514b..e639073112 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improve\sthe\ssqlite3_str_vappendf()\sroutine\sfor\sadditional\srobustness\sin\sthe\nface\sof\sover-sized\sinputs.\nProbable\sfix\sfor\s[bugs:/info/2026-06-25T11:29:23Z|Bug\s2026-06-25T11:29:23Z]. -D 2026-06-25T14:48:09.072 +C Change\sthe\sundocumented\sand\sunsupported\ssqlite_log()\sSQL\sfunction\sso\sthat\nit\sis\smarked\sas\sunsafe\sand\sdirect-only.\n[bugs:/info/3311f8d5b8|Bug\s2026-06-25T10:19:43Z]. +D 2026-06-25T15:17:15.511 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -691,7 +691,7 @@ F src/delete.c 59eeca3fb88c29329afc41bb803ee568b120d9dd7470b5f38ab55cc38390b451 F src/expr.c db0f3e084f4bb2b249a5890dc9a0d3614d503cda009357bfdeb040f96322ccfe F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 931f74cec1dc8038a0217ef340c91ce147dd1bbed08dc40c47ee0ec6edfffb08 -F src/func.c 7e049176003271095ba560bca90995c8cb7c1e944aee539513daba015b172a18 +F src/func.c bb839e662478ffcc9f0377258f32ac9e8257c8e67f1539e08bc5fa3dd185184a F src/global.c 7eea537ac0c113ac55cb2dd4d8fc2a6a91ae478be34231b4efaffc46817fee85 F src/hash.c 03c8c0f4be9e8bcb6de65aa26d34a61d48a9430747084a69f9469fbb00ea52ca F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf @@ -2208,8 +2208,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 533e59b40c4ce6b3579cb85deb9cb1a7179aa2cf4f91d8848558087869653a76 -R ae624d5f391b48a06271e9ea7c82fcdc +P d7e4b2a85f81dacfee497d806bbc9f8c262624bd618aa27d4d238191643a4f5d +R 2d15f89d56bbd2cc947e7e3db3d23683 U drh -Z 9b8286faa7f7c2ce59f32e157afe28d6 +Z 0bc74c0ac0ee666f537b9b3999e40f52 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ac22dc7943..b4035f2422 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d7e4b2a85f81dacfee497d806bbc9f8c262624bd618aa27d4d238191643a4f5d +c30ea3cefe346a3d87b57710a51b059371543c5abc75d08c4ca827bbe3b3f622 diff --git a/src/func.c b/src/func.c index b86789be43..12641e9f12 100644 --- a/src/func.c +++ b/src/func.c @@ -3379,7 +3379,7 @@ void sqlite3RegisterBuiltinFunctions(void){ FUNCTION(nullif, 2, 0, 1, nullifFunc ), DFUNCTION(sqlite_version, 0, 0, 0, versionFunc ), DFUNCTION(sqlite_source_id, 0, 0, 0, sourceidFunc ), - FUNCTION(sqlite_log, 2, 0, 0, errlogFunc ), + SFUNCTION(sqlite_log, 2, 0, 0, errlogFunc ), FUNCTION(unistr, 1, 0, 0, unistrFunc ), FUNCTION(quote, 1, 0, 0, quoteFunc ), FUNCTION(unistr_quote, 1, 1, 0, quoteFunc ),