diff options
| author | drh <> | 2022-03-29 19:19:23 +0000 |
|---|---|---|
| committer | drh <> | 2022-03-29 19:19:23 +0000 |
| commit | 555db979f68ed2efffd080d22c3ae5c3ea7740b2 (patch) | |
| tree | 70f4290a43fcd5fb587d602bf45317d65d4a05e7 /src | |
| parent | de9484858e8cbf66bf86e27f2e4a31cfde641d35 (diff) | |
| download | sqlite-555db979f68ed2efffd080d22c3ae5c3ea7740b2.tar.gz sqlite-555db979f68ed2efffd080d22c3ae5c3ea7740b2.zip | |
Reverse the order of two tests to stop a harmless initialized value
warning from MSAN - reported by OSSFuzz.
FossilOrigin-Name: 800b8fdad73b67105e416b4b5c6a5c5ded7d6a43b4eacd6b67d690cab7584b0b
Diffstat (limited to 'src')
| -rw-r--r-- | src/vdbemem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vdbemem.c b/src/vdbemem.c index 7a736fc21..cb44f3ab2 100644 --- a/src/vdbemem.c +++ b/src/vdbemem.c @@ -204,13 +204,13 @@ int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){ assert( !sqlite3VdbeMemIsRowSet(pMem) ); assert( desiredEnc==SQLITE_UTF8 || desiredEnc==SQLITE_UTF16LE || desiredEnc==SQLITE_UTF16BE ); - if( pMem->enc==desiredEnc ){ - return SQLITE_OK; - } if( !(pMem->flags&MEM_Str) ){ pMem->enc = desiredEnc; return SQLITE_OK; } + if( pMem->enc==desiredEnc ){ + return SQLITE_OK; + } assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) ); #ifdef SQLITE_OMIT_UTF16 return SQLITE_ERROR; |