diff options
| author | drh <drh@noemail.net> | 2015-07-23 21:59:58 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-07-23 21:59:58 +0000 |
| commit | 244c8d7077ea25763bf2efce123da2f7d2d811cc (patch) | |
| tree | 76ee15618f861fe989e7b16dfaca84bb121f35a3 /src/printf.c | |
| parent | 38151adfe2f51c07ca50e9cbc6f44a9811097eb1 (diff) | |
| parent | cfb8f8d6a9073040e90f0bf502f4b108d7917433 (diff) | |
| download | sqlite-244c8d7077ea25763bf2efce123da2f7d2d811cc.tar.gz sqlite-244c8d7077ea25763bf2efce123da2f7d2d811cc.zip | |
Merge all changes in the latest 3.8.11 beta into the sessions branch.
Changes include the rename of OTA to RBU, the WITHOUT-ROWID-OR-Skipscan fix,
and improvements to pcache1.
FossilOrigin-Name: 7f0ee77062d2fcb014942c7c62c163ccc801f21b
Diffstat (limited to 'src/printf.c')
| -rw-r--r-- | src/printf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/printf.c b/src/printf.c index 72b9497d7..018df412f 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1012,6 +1012,11 @@ char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ ** sqlite3_log() must render into a static buffer. It cannot dynamically ** allocate memory because it might be called while the memory allocator ** mutex is held. +** +** sqlite3VXPrintf() might ask for *temporary* memory allocations for +** certain format characters (%q) or for very large precisions or widths. +** Care must be taken that any sqlite3_log() calls that occur while the +** memory mutex is held do not use these mechanisms. */ static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){ StrAccum acc; /* String accumulator */ |