summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/sqlite/patched/src/vdbemem.c
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/sqlite/patched/src/vdbemem.c')
-rw-r--r--chromium/third_party/sqlite/patched/src/vdbemem.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/third_party/sqlite/patched/src/vdbemem.c b/chromium/third_party/sqlite/patched/src/vdbemem.c
index 4a39db0523f..1689ccee835 100644
--- a/chromium/third_party/sqlite/patched/src/vdbemem.c
+++ b/chromium/third_party/sqlite/patched/src/vdbemem.c
@@ -594,8 +594,7 @@ i64 sqlite3VdbeIntValue(Mem *pMem){
return pMem->u.i;
}else if( flags & MEM_Real ){
return doubleToInt64(pMem->u.r);
- }else if( flags & (MEM_Str|MEM_Blob) ){
- assert( pMem->z || pMem->n==0 );
+ }else if( (flags & (MEM_Str|MEM_Blob))!=0 && pMem->z!=0 ){
return memIntValue(pMem);
}else{
return 0;