Enable SQLITE_DIRECT_OVERFLOW_READ unless it is specifically disabled using

the -DSQLITE_DIRECT_OVERFLOW_READ=0 compile-time option.

FossilOrigin-Name: 630604a4e604bfb36c31602917bfa8d42c10c82966d0819932bf8f827b9158b8

diff --git a/manifest b/manifest
index 38a6bc067f389f9835c3eb43374821a3a863eca3..5d634df3b01da0ee0c249afab54c7db279b92c90 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sfts5origintext4.test\sto\swork\swith\sSQLITE_DIRECT_OVERFLOW_READ.
-D 2023-12-28T20:54:12.871
+C Enable\sSQLITE_DIRECT_OVERFLOW_READ\sunless\sit\sis\sspecifically\sdisabled\susing\nthe\s-DSQLITE_DIRECT_OVERFLOW_READ=0\scompile-time\soption.
+D 2023-12-28T21:02:08.508
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -742,7 +742,7 @@ F src/shell.c.in 85f8d52fa4f7773823736dd39d0a268fd739207fcae95883c9ec8ce4af59f7d
 F src/sqlite.h.in 61a60b4ea04db8ead15e1579b20b64cb56e9f55d52c5f9f9694de630110593a3
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
-F src/sqliteInt.h 134457f62bb1d0ff1dd037cc23dd46b1d16efbbfc2211dc2b15c380af731d9ac
+F src/sqliteInt.h 4552ac3dbe5be857817cff0855cdabbd20db0252739f463b5a193117c8880a02
 F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6
 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2156,8 +2156,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 190ab3c08431a0ba24d76392eab251f5c1792add05e4ec780998b299208eca95
-R 4943b60b261f8c7a6ac606918009691b
-U dan
-Z fb03567f575be0bb5e8370f46dac37ef
+P 15ed002aed12556aeb9bbe537c4ba839f0c95bac65a69d03401b37cc3fd11b92
+R dd6052667512259356a7715bc34535d0
+U drh
+Z 55f29f3b5d27fdb56a096a8d4f3db641
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index df66e453ac822dc002c920834fe3b1bdd32d1d73..d0393eb237469b4b0a525a8c23ab6f0373ac3901 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-15ed002aed12556aeb9bbe537c4ba839f0c95bac65a69d03401b37cc3fd11b92
\ No newline at end of file
+630604a4e604bfb36c31602917bfa8d42c10c82966d0819932bf8f827b9158b8
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index a21425a14449e2379643f6de1ed3d6ddf2cc3c51..75ac749c0d7d88e0772a8fcd0298258de91f9558 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -328,6 +328,19 @@
 # undef SQLITE_USE_SEH
 #endif
 
+/*
+** Enable SQLITE_DIRECT_OVERFLOW_READ, unless the build explicitly
+** disables it using -DSQLITE_DIRECT_OVERFLOW_READ=0
+*/
+#if defined(SQLITE_DIRECT_OVERFLOW_READ) && SQLITE_DIRECT_OVERFLOW_READ+1==1
+  /* Disable if -DSQLITE_DIRECT_OVERFLOW_READ=0 */
+# undef SQLITE_DIRECT_OVERFLOW_READ
+#else
+  /* In all other cases, enable */
+# define SQLITE_DIRECT_OVERFLOW_READ 1
+#endif
+
+
 /*
 ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
 ** 0 means mutexes are permanently disable and the library is never