diff options
author | drh <> | 2025-04-17 17:46:28 +0000 |
---|---|---|
committer | drh <> | 2025-04-17 17:46:28 +0000 |
commit | 56747d184053e586848b22cce94fa8e0efa6f1aa (patch) | |
tree | 9d1da6f4effc1df53d40c232d997bbe4d5bb3136 | |
parent | 680a9584c6eaa98e16d682f0e0bd57f4abc36350 (diff) | |
download | sqlite-56747d184053e586848b22cce94fa8e0efa6f1aa.tar.gz sqlite-56747d184053e586848b22cce94fa8e0efa6f1aa.zip |
Increase the size of the output buffer for sqlite3_log().
FossilOrigin-Name: a64e8491c9863f890daa9f5d8f678728dc0d00bc1f3c238b50214ec545450fcf
-rw-r--r-- | manifest | 14 | ||||
-rw-r--r-- | manifest.uuid | 2 | ||||
-rw-r--r-- | src/printf.c | 11 |
3 files changed, 18 insertions, 9 deletions
@@ -1,5 +1,5 @@ -C Add\sdocs\sexplaining\show\sto\stest\sthe\steaish\sbuild. -D 2025-04-16T22:25:02.780 +C Increase\sthe\ssize\sof\sthe\soutput\sbuffer\sfor\ssqlite3_log(). +D 2025-04-17T17:46:28.539 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -781,7 +781,7 @@ F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5 F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd F src/pragma.c 30b535d0a66348df844ee36f890617b4cf45e9a22dcbc47ec3ca92909c50aaf1 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 -F src/printf.c 33fc0d7643c848a098afdcb6e1db6de12379d47084b1cd0912cfce1d09345e44 +F src/printf.c 3b91c334f528359145f4dde0dedd945bbb21044d0825ea064934d7222d61662c F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 20e1fbe8f840ffc0cd835e33f68a802a22e34faa918d7a269f3de242fda02f99 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 @@ -2216,8 +2216,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P c86315e538f4d75161faa72673927cde8be080c983f04a98491d1add14615038 -R e22f6e8195a60e01cd4d511f333ebac2 -U stephan -Z cdf29b539adbf4afb90ada6e24ecd013 +P b53619ddb74fa250f03564d04e732248b4161d4d10d6f02268b7c95382d110ff +R 697ea128a22ed3f6aeba23f77c35f372 +U drh +Z a2dd1de2440a1a7a57581f1ac40bf684 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9be9a3b1d..792da94e0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b53619ddb74fa250f03564d04e732248b4161d4d10d6f02268b7c95382d110ff +a64e8491c9863f890daa9f5d8f678728dc0d00bc1f3c238b50214ec545450fcf diff --git a/src/printf.c b/src/printf.c index 166c11194..8cb5a43c5 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1344,6 +1344,15 @@ char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ return zBuf; } +/* Maximum size of an sqlite3_log() message. */ +#if defined(SQLITE_MAX_LOG_MESSAGE) + /* Leave the definition as supplied */ +#elif SQLITE_PRINT_BUF_SIZE*10>10000 +# define SQLITE_MAX_LOG_MESSAGE 10000 +#else +# define SQLITE_MAX_LOG_MESSAGE (SQLITE_PRINT_BUF_SIZE*10) +#endif + /* ** This is the routine that actually formats the sqlite3_log() message. ** We house it in a separate routine from sqlite3_log() to avoid using @@ -1360,7 +1369,7 @@ char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ */ static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){ StrAccum acc; /* String accumulator */ - char zMsg[SQLITE_PRINT_BUF_SIZE*3]; /* Complete log message */ + char zMsg[SQLITE_MAX_LOG_MESSAGE]; /* Complete log message */ sqlite3StrAccumInit(&acc, 0, zMsg, sizeof(zMsg), 0); sqlite3_str_vappendf(&acc, zFormat, ap); |