Disable the use of strchrnul() unless specifically enabled by compile-time

options.  Cherrypick of check-in [e580470db77d6da9]

FossilOrigin-Name: 837368adfe859c41b347d3124d5b3fdf790eec03

diff --git a/manifest b/manifest
index d38979f11090c801c886418adc25a8acccac373f..f5c3788a3258b03c998b927f292776b4fbd7cb7d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sOP_Column\sopcode,\swhen\sextracting\sa\sfield\sthat\sis\spast\sthe\send\sof\na\sshort\srecord\s(because\sthe\srow\swas\soriginally\sinserted\sprior\sto\sALTER\sTABLE\nADD\sCOLUMN)\sthen\smake\ssure\sthe\soutput\sregister\sis\sfully\sNULL\sand\sdoes\snot\ncontain\sleftover\sflags\s(such\sas\sMEM_Ephem)\sfrom\sits\sprevious\suse.\nFix\sfor\sticket\s[43107840f1c02].\s\sThis\sis\sa\scherrypick\sof\ncheck-in\s[24780f8ddc1683fc].
-D 2014-10-29T01:13:58.092
+C Disable\sthe\suse\sof\sstrchrnul()\sunless\sspecifically\senabled\sby\scompile-time\noptions.\s\sCherrypick\sof\scheck-in\s[e580470db77d6da9]
+D 2014-10-29T01:18:03.185
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -223,7 +223,7 @@ F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
 F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
 F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 F src/prepare.c 6ef0cf2f9274982988ed6b7cab1be23147e94196
-F src/printf.c 6b79bbd063dcbadca4cf617a4cde255bcc13ea64
+F src/printf.c 090fac0f779c93c8a95089a125339686648835e4
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
@@ -1204,8 +1204,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a8f9bd1e890434fcffa02fcd2baf8b0fb5d4c9dd
-Q +24780f8ddc1683fc62180e6961dc6bfe1168f4df
-R d684ab06f9952cfb8bd4bb795d206cf9
+P 304ea6ba6f4cf40a76d32d37af73a253f493ba47
+Q +e580470db77d6da970c755102790e603fb26b3c6
+R 87a2c5d1dcd7231208aa0589a51fed61
 U drh
-Z 6a68e4e50056aa43b6faddb91db24dac
+Z b2af8bf5eda5ca802506e90d5ed9925a

diff --git a/manifest.uuid b/manifest.uuid
index e62a923d4df533bc5de278d76d23f0c5971dcc16..3e0b305a641563efced78aa41444ba3351b9efd3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-304ea6ba6f4cf40a76d32d37af73a253f493ba47
\ No newline at end of file
+837368adfe859c41b347d3124d5b3fdf790eec03
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index c0b3c70f6bc2442bbb09c39f50d0f9a1ecae6079..1df287fbb632d9dbc2dc5e32699c9cd77c685d78 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -21,11 +21,7 @@
 ** the glibc version so the glibc version is definitely preferred.
 */
 #if !defined(HAVE_STRCHRNUL)
-# if defined(linux)
-#  define HAVE_STRCHRNUL 1
-# else
-#  define HAVE_STRCHRNUL 0
-# endif
+# define HAVE_STRCHRNUL 0
 #endif