diff options
| author |   jturner <jturner@openbsd.org> | 2015-03-16 00:06:33 +0000 |
|---|---|---|
| committer | jturner <jturner@openbsd.org> | 2015-03-16 00:06:33 +0000 |
| commit | 476ed7b902c71c189883939f8fb66a03e3eb82d9 (patch) | |
| tree | ac10f46a6d4287dd3790a3815808837f9318d24b /lib/libsqlite3/src/utf.c | |
| parent | from zhuk: two grammar fixes; (diff) | |
| download | wireguard-openbsd-476ed7b902c71c189883939f8fb66a03e3eb82d9.tar.xz wireguard-openbsd-476ed7b902c71c189883939f8fb66a03e3eb82d9.zip | |
Update sqlite3 to 3.8.7.4. Changes available here: http://sqlite.org/changes.html#version_3_8_7_4
ok landry@
Diffstat (limited to 'lib/libsqlite3/src/utf.c')
| -rw-r--r-- | lib/libsqlite3/src/utf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libsqlite3/src/utf.c b/lib/libsqlite3/src/utf.c index 97898746a29..25f4dadf0c7 100644 --- a/lib/libsqlite3/src/utf.c +++ b/lib/libsqlite3/src/utf.c @@ -199,7 +199,7 @@ u32 sqlite3Utf8Read( ** desiredEnc. It is an error if the string is already of the desired ** encoding, or if *pMem does not contain a string value. */ -int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ +SQLITE_NOINLINE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ int len; /* Maximum length of output string in bytes */ unsigned char *zOut; /* Output buffer */ unsigned char *zIn; /* Input iterator */ @@ -314,12 +314,13 @@ int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ *z = 0; assert( (pMem->n+(desiredEnc==SQLITE_UTF8?1:2))<=len ); + c = pMem->flags; sqlite3VdbeMemRelease(pMem); - pMem->flags &= ~(MEM_Static|MEM_Dyn|MEM_Ephem); + pMem->flags = MEM_Str|MEM_Term|(c&MEM_AffMask); pMem->enc = desiredEnc; - pMem->flags |= (MEM_Term); pMem->z = (char*)zOut; pMem->zMalloc = pMem->z; + pMem->szMalloc = sqlite3DbMallocSize(pMem->db, pMem->z); translate_out: #if defined(TRANSLATE_TRACE) && defined(SQLITE_DEBUG) |